Skip to content

Commit

Permalink
Merge branch 'feature-deterministic'
Browse files Browse the repository at this point in the history
Conflicts:
	.gitignore
	README.md
  • Loading branch information
Andrew Fray committed Oct 15, 2013
2 parents acbff67 + c36d2c8 commit 562696e
Show file tree
Hide file tree
Showing 56 changed files with 19,037 additions and 9 deletions.
10 changes: 2 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,2 @@
[Ll]ibrary/
[Tt]emp/
[Oo]bj/

# Autogenerated VS/MD solution and project files
*.csproj
*.unityproj
*.sln
*~
*#
5 changes: 5 additions & 0 deletions LitJson.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions LitJson/AssemblyInfo.cs.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
using System;
using System.Reflection;
using System.Runtime.CompilerServices;


[assembly: CLSCompliant (true)]

[assembly: AssemblyTitle ("LitJson")]
[assembly: AssemblyDescription ("LitJSON library")]
[assembly: AssemblyConfiguration ("")]
[assembly: AssemblyCompany ("")]
[assembly: AssemblyProduct ("LitJSON")]
[assembly: AssemblyCopyright (
"The authors disclaim copyright to this source code")]
[assembly: AssemblyTrademark ("")]
[assembly: AssemblyCulture ("")]

[assembly: AssemblyVersion ("@ASSEMBLY_VERSION@")]
4 changes: 4 additions & 0 deletions LitJson/AssemblyInfo.cs.in.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 60 additions & 0 deletions LitJson/IJsonWrapper.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
#region Header
/**
* IJsonWrapper.cs
* Interface that represents a type capable of handling all kinds of JSON
* data. This is mainly used when mapping objects through JsonMapper, and
* it's implemented by JsonData.
*
* The authors disclaim copyright to this source code. For more details, see
* the COPYING file included with this distribution.
**/
#endregion


using System.Collections;
using System.Collections.Specialized;


namespace LitJson
{
public enum JsonType
{
None,

Object,
Array,
String,
Int,
Long,
Double,
Boolean
}

public interface IJsonWrapper : IList, IOrderedDictionary
{
bool IsArray { get; }
bool IsBoolean { get; }
bool IsDouble { get; }
bool IsInt { get; }
bool IsLong { get; }
bool IsObject { get; }
bool IsString { get; }

bool GetBoolean ();
double GetDouble ();
int GetInt ();
JsonType GetJsonType ();
long GetLong ();
string GetString ();

void SetBoolean (bool val);
void SetDouble (double val);
void SetInt (int val);
void SetJsonType (JsonType type);
void SetLong (long val);
void SetString (string val);

string ToJson ();
void ToJson (JsonWriter writer);
}
}
8 changes: 8 additions & 0 deletions LitJson/IJsonWrapper.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 562696e

Please sign in to comment.