去除硬编码

Author: undefined-ux

cli/cli.vcxproj

@@ -71,7 +71,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LibraryPath>D:\code\homework\json-parser\x64;$(LibraryPath)</LibraryPath>
+    <LibraryPath>$(SolutionDir)$(PlatformTarget);$(LibraryPath)</LibraryPath>
     <TargetName>json</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -111,13 +111,13 @@
       <SDLCheck>false</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>D:\code\homework\json-parser\core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)core;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <SuppressStartupBanner>false</SuppressStartupBanner>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>D:\code\homework\json-parser\cli\x64\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)$(PreferredToolArchitecture)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>core.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

core/core.vcxproj

@@ -104,7 +104,6 @@
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <SDLCheck>false</SDLCheck>
-      <CallingConvention>Cdecl</CallingConvention>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

core/parser.c

@@ -1,4 +1,3 @@
-#pragma once
 #include "parser.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -18,6 +17,21 @@ void ignoreWhiteCharactor() {
 	}
 }
 
+int hexCharToInt(char c) {
+	if ('0' <= c && c <= '9') {
+		return c - '0';
+	}
+	else if ('a' <= c && c <= 'f') {
+		return 10 + c - 'a';
+	}
+	else if ('A' <= c && c <= 'F') {
+		return 10 + c - 'A';
+	}
+	else {
+		fprintf(stderr, "Invalid hexadecimal character: %c\n", c);
+		exit(1);
+	}
+}
 
 struct JsonVal* parseValue() {
 	ignoreWhiteCharactor();
@@ -47,31 +61,95 @@ struct JsonVal* parseValue() {
 }
 
 struct JsonVal* parseString() {
-	char c; struct JsonString* str = JsonString_New();
+	char c;
+	struct JsonString* str = JsonString_New();
 	size_t pos = ftell(f) / sizeof(char);
+
 	while ((c = fgetc(f)) && c != EOF && c != '"' && c != '\'') {
-		JsonStringPushBackChar(c, str);
+		if (c == '\\') { // Check for escape character
+			c = fgetc(f); // Read the next character after '\'
+			if (c == EOF) {
+				fprintf(stderr, "Unexpected EOF after escape character.\tString value parse begin with %llu\n", pos);
+				exit(1);
+			}
+			// Process escaped character
+			switch (c) {
+			case '"':
+			case '\'':
+			case '\\':
+				// These characters are escaped as themselves
+				JsonStringPushBackChar(c, str);
+				break;
+			case 'n':
+				JsonStringPushBackChar('\n', str);
+				break;
+			case 't':
+				JsonStringPushBackChar('\t', str);
+				break;
+			case 'u': {
+				// Unicode escape sequence: \uXXXX
+				int unicodeValue = 0;
+				for (int i = 0; i < 4; ++i) {
+					c = fgetc(f);
+					if (c == EOF) {
+						fprintf(stderr, "Unexpected EOF in Unicode escape sequence.\tString value parse begin with %llu\n", pos);
+						exit(1);
+					}
+					unicodeValue = unicodeValue * 16 + hexCharToInt(c);
+				}
+				// Assuming JsonStringPushBackUnicode is a function that appends a Unicode character to the string
+				JsonStringPushBackChar(unicodeValue, str);
+				break;
+			}
+			case '0':
+				// Null character
+				JsonStringPushBackChar('\0', str);
+				break;
+			case 'x': {
+				// Hexadecimal escape sequence: \xXX
+				int hexValue = 0;
+				for (int i = 0; i < 2; ++i) {
+					c = fgetc(f);
+					if (c == EOF) {
+						fprintf(stderr, "Unexpected EOF in hexadecimal escape sequence.\tString value parse begin with %llu\n", pos);
+						exit(1);
+					}
+					hexValue = hexValue * 16 + hexCharToInt(c);
+				}
+				JsonStringPushBackChar((char)hexValue, str);
+				break;
+			}
+					// Add more cases for other escape sequences as needed
+			default:
+				fprintf(stderr, "Invalid escape sequence: \\%c\tString value parse begin with %llu\n", c, pos);
+				exit(1);
+			}
+		}
+		else {
+			JsonStringPushBackChar(c, str);
+		}
 	}
-		
+
 	if (c != '"' && c != '\'') {
-		fprintf(
-			stderr, 
-			"Excepted charactor \" or ', but got EOF.\tString value parse begin with %llu\n",
-			pos
-		); // 写入报错到标准错误流
+		fprintf(stderr, "Expected character \" or ', but got EOF.\tString value parse begin with %llu\n", pos);
 		exit(1);
 	}
+
 	struct JsonVal* res = (struct JsonVal*)malloc(sizeof(struct JsonVal));
 	if (res == NULL) {
-		// 内存分配失败 OOM (?)
-		// 异常退出， OS进行内存回收
+		// Memory allocation failure (OOM)
+		// Handle the error and exit
 		exit(1);
 	}
-	res->type = STRING; res->val = str;
+
+	res->type = STRING;
+	res->val = str;
 	return res;
 }
 
 
+
+
 struct JsonVal* parseNumber() {
 	char c;
 	struct JsonString* str = JsonString_New();

test/test.vcxproj

@@ -104,7 +104,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>D:\code\homework\json-parser\core;D:\code\homework\json-parser\cutest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)core;$(SolutionDir)cutest;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>