Add LICENSE and Readme

Author: undefined-ux

LICENSE.md

@@ -0,0 +1,25 @@
+The MIT License (MIT)
+=====================
+Copyright © `2023` `undefined-ux`
+
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the “Software”), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -0,0 +1,19 @@
+# 大一 C语言大作业
+
+## json解析器
+
+### 命令行版本
+
+#### 使用
+```
+如果未指定输入或输出文件，则程序将默认使用标准输入或标准输出。
+注意：-c / --compress 和 -f / --format 选项不能同时使用
+-if, --input 指定输入文件（默认为标准输入）
+-of, --output 指定输出文件（默认为标准输出）
+-f, --format 使用树形缩进输出格式化的JSON
+-h, --help 显示此帮助并退出
+-c, --compress 输出压缩的JSON
+```
+[下载](https://github.com/undefined-ux/json-parser-homework/releases)
+[文档](https://undefined-ux.github.io/json-parser-homework)
+<del>GUI目前仍然是饼， 没做</del> 

cli/cli.vcxproj

@@ -126,9 +126,10 @@
       <WarningLevel>Level3</WarningLevel>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
+      <SDLCheck>false</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>D:\code\homework\json-parser\core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

core/JsonObject.c

@@ -25,6 +25,5 @@ void JsonObjInsert(
 
 void destoryJsonObj(struct JsonObj* obj) {
 	if(obj->key != NULL) destoryJsonString(obj->key);
-	if(obj->val != NULL) destoryJsonVal(obj->value);
-
+	if(obj->value != NULL) destoryJsonVal(obj->value);
 }

core/core.vcxproj

@@ -46,7 +46,7 @@
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -116,7 +116,7 @@
       <WarningLevel>Level3</WarningLevel>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
+      <SDLCheck>false</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>

core/parser.c

@@ -24,7 +24,10 @@ struct JsonVal* parseValue() {
 	char c = fgetc(f);
 	if (c == '{') return parseObject();
 	else if (c == '[') return parseArray();
-	else if (c == 'n') return parseNull();
+	else if (c == 'n' || c == 'N') {
+		ungetc(c, f);
+		return parseNull();
+	}
 	else if (c == 't' || c == 'T' || c == 'F' || c == 'f') {
 		ungetc(c, f);
 		return parseBool();
@@ -106,7 +109,7 @@ struct JsonVal* parseNumber() {
 		// 内存分配失败
 		exit(1);
 	}
-
+	ungetc(c, f);
 	res->type = NUMBER;
 	res->val = str;
 	return res;
@@ -146,6 +149,7 @@ struct JsonVal* parseBool() {
 			// 异常退出， OS进行内存回收
 			exit(1);
 		}
+
 		res->type = BOOL; res->val = JsonStringFromCharArray("true");
 		return res;
 	}
@@ -256,12 +260,12 @@ struct JsonVal* parseArray() {
 
 struct JsonVal* parseNull() {
 	char nullStr[] = "null", c;
-	for (int i = 1; i < 5; i++) {
+	for (int i = 0; i < 4; i++) {
 		c = fgetc(f);
 		if (c != nullStr[i] && c != nullStr[i] - 'a' + 'A') {
 			fprintf(
 				stderr,
-				"Excepted token %c at %llu",
+				"Unexcepted token %c at %llu",
 				c, ftell(f) / sizeof(char)
 			); // 写入报错到标准错误流
 			exit(1);
@@ -271,7 +275,7 @@ struct JsonVal* parseNull() {
 	if (c != ' ' && c != '\n' && c != ',' && c != ']' && c != '}') {
 		fprintf(
 			stderr,
-			"Excepted token %c at %llu",
+			"Unexcepted token %c at %llu",
 			c, ftell(f) / sizeof(char)
 		); // 写入报错到标准错误流
 		exit(1);

cutest/cutest.vcxproj

@@ -115,7 +115,7 @@
       <WarningLevel>Level3</WarningLevel>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
+      <SDLCheck>false</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>

test/test.vcxproj

@@ -116,9 +116,10 @@
       <WarningLevel>Level3</WarningLevel>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
+      <SDLCheck>false</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>D:\code\homework\json-parser\cutest;D:\code\homework\json-parser\core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>