Browse Source

Misc cleanup

Brad Robinson 11 years ago
parent
commit
5c222d72e7
3 changed files with 15 additions and 13 deletions
  1. 13 6
      PetaJson.cs
  2. 0 6
      PetaJson.sln
  3. 2 1
      readme.md

+ 13 - 6
PetaJson.cs

@@ -1,9 +1,16 @@
-/* PetaJson v0.5 - A simple but flexible Json library in a single .cs file.
- *
- * Copyright © 2014 Topten Software.  All Rights Reserved.
- * 
- * Apache License 2.0 - http://www.toptensoftware.com/petapoco/license
- */
+// PetaJson v0.5 - A simple but flexible Json library in a single .cs file.
+// 
+// Copyright (C) 2014 Topten Software (contact@toptensoftware.com) All rights reserved.
+// 
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this product 
+// except in compliance with the License. You may obtain a copy of the License at
+// 
+// http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software distributed under the 
+// License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
+// either express or implied. See the License for the specific language governing permissions 
+// and limitations under the License.
 
 
 // Define PETAJSON_NO_DYNAMIC to disable Expando support
 // Define PETAJSON_NO_DYNAMIC to disable Expando support
 // Define PETAJSON_NO_EMIT to disable Reflection.Emit
 // Define PETAJSON_NO_EMIT to disable Reflection.Emit

+ 0 - 6
PetaJson.sln

@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 # Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestCases", "TestCases\TestCases.csproj", "{B1C908D5-CFEE-41D7-8D5C-50D0DD697E2C}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestCases", "TestCases\TestCases.csproj", "{B1C908D5-CFEE-41D7-8D5C-50D0DD697E2C}"
 EndProject
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmitDev", "EmitDev\EmitDev.csproj", "{C70C2324-5076-497A-B93F-C3C49DFDB045}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FF86ACF7-E4CB-4873-96CE-CE495873073E}"
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FF86ACF7-E4CB-4873-96CE-CE495873073E}"
 	ProjectSection(SolutionItems) = preProject
 	ProjectSection(SolutionItems) = preProject
 		Performance1.psess = Performance1.psess
 		Performance1.psess = Performance1.psess
@@ -20,10 +18,6 @@ Global
 		{B1C908D5-CFEE-41D7-8D5C-50D0DD697E2C}.Debug|x86.Build.0 = Debug|x86
 		{B1C908D5-CFEE-41D7-8D5C-50D0DD697E2C}.Debug|x86.Build.0 = Debug|x86
 		{B1C908D5-CFEE-41D7-8D5C-50D0DD697E2C}.Release|x86.ActiveCfg = Release|x86
 		{B1C908D5-CFEE-41D7-8D5C-50D0DD697E2C}.Release|x86.ActiveCfg = Release|x86
 		{B1C908D5-CFEE-41D7-8D5C-50D0DD697E2C}.Release|x86.Build.0 = Release|x86
 		{B1C908D5-CFEE-41D7-8D5C-50D0DD697E2C}.Release|x86.Build.0 = Release|x86
-		{C70C2324-5076-497A-B93F-C3C49DFDB045}.Debug|x86.ActiveCfg = Debug|x86
-		{C70C2324-5076-497A-B93F-C3C49DFDB045}.Debug|x86.Build.0 = Debug|x86
-		{C70C2324-5076-497A-B93F-C3C49DFDB045}.Release|x86.ActiveCfg = Release|x86
-		{C70C2324-5076-497A-B93F-C3C49DFDB045}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 		HideSolutionNode = FALSE

+ 2 - 1
readme.md

@@ -446,7 +446,8 @@ routine must read each value from the IJsonReader before returning.
 *Parse* - parses a typed value from the input stream.
 *Parse* - parses a typed value from the input stream.
 
 
 *GetLiteralKind*, *GetLiteralString* and *NextToken* provide ability to read literals without boxing
 *GetLiteralKind*, *GetLiteralString* and *NextToken* provide ability to read literals without boxing
-the value.  Used by the PetaJsonEmit.
+the value into an Object.  Used by the "Reflection.Emit" type parsers, these are much faster than 
+ReadLiteral, but less convenient to use.
 
 
 ### IJsonWriter
 ### IJsonWriter