Merge pull request #298 from e6nlaq:e6nlaq/issue296

Support for characters larger than 2 bytes
e6nlaq · Mar 6, 2023 · 395a88c · 395a88c
2 parents 97ca3c5 + 5160495
commit 395a88c
Show file tree

Hide file tree

Showing 10 changed files with 543 additions and 3 deletions.
diff --git a/aqua.cpp b/aqua.cpp
@@ -1592,6 +1592,9 @@ inline string aqua(string script, vector<string> line, int linenum)
 
 			return to_string(s.size());
 		}
+		else if (func == "?")
+		{
+		}
 		else
 		{
 			if (!op_funcskip && func != "" && func[0] >= '0')
@@ -1785,7 +1788,11 @@ int main(int argc, char const *argv[])
 
 	while (getline(file, read_file))
 	{
+#ifdef WINDOWS
+		lines.push_back(utf8_to_ansi(read_file));
+#else
 		lines.push_back(read_file);
+#endif
 	}
 
 	// インシデント対応

diff --git a/aqua.obj b/aqua.obj
diff --git a/bin/x64/aqua b/bin/x64/aqua
diff --git a/bin/x64/aqua.exe b/bin/x64/aqua.exe
diff --git a/bin/x86/aqua b/bin/x86/aqua
diff --git a/debug.aqua b/debug.aqua
@@ -1,2 +1,5 @@
 
-outf "ああ"
+var string S
+set S "マジ!?変数も!?(OWO)"
+
+outf S
diff --git a/lib/all.h b/lib/all.h
@@ -15,4 +15,5 @@
 #include "./script.h"
 #include "./stdc++.h"
 #include "./math.h"
-#include "./type.h"
+#include "./type.h"
+// #include "./strconv.h"
diff --git a/lib/script.h b/lib/script.h
@@ -31,7 +31,7 @@ inline vector<string> scriptcut(string line)
 
 		if (c != ' ')
 		{
-			if (c != '\t' && (c == '\n' || c >= ' '))
+			if (c != '\t' && (c == '\n' || c >= ' ' || c < 0))
 				result[i] += c;
 			if (c == '\"')
 			{

diff --git a/lib/stdc++.h b/lib/stdc++.h
@@ -46,6 +46,10 @@
 // windows
 #include <windows.h>
 #include <conio.h>
+#include "./strconv.h"
+
+#define WINDOWS 1
+
 #else
 // linux
 #endif