Fix UTF-8 in Windows console (#354)

doc/api.md

@@ -14,13 +14,13 @@ Allocates memory for the interpreter and returns the interpreter instance handle
 
 ```
 UMKA_API bool umkaInit(void *umka, const char *fileName, const char *sourceString, 
-                       int stackSize, const char *locale, 
+                       int stackSize, void *reserved, 
                        int argc, char **argv, 
                        bool fileSystemEnabled, bool implLibsEnabled,
                        UmkaWarningCallback warningCallback);
 ```
 
-Initializes the interpreter instance. Here, `umka` is the interpreter instance handle, `fileName` is the Umka source file name, `sourceString` is an optional string buffer that contains the program source, `stackSize` is the fiber stack size, in slots, `argc` and `argv` represent the standard C/C++ command-line parameter data. If `sourceString` is not `NULL`, the program source is read from this string rather than from a file. A fictitious `fileName` should nevertheless be specified.  An optional `locale` string can be specified. The `fileSystemEnabled` flag allows the Umka program to access the file system, and the `implLibsEnabled` flag allows it to use UMIs. If `warningCallback` is not `NULL`, it will be called on every warning. Returns `true` if the source has been successfully loaded.
+Initializes the interpreter instance. Here, `umka` is the interpreter instance handle, `fileName` is the Umka source file name, `sourceString` is an optional string buffer that contains the program source, `stackSize` is the fiber stack size, in slots, `argc` and `argv` represent the standard C/C++ command-line parameter data. If `sourceString` is not `NULL`, the program source is read from this string rather than from a file. A fictitious `fileName` should nevertheless be specified. The `fileSystemEnabled` flag allows the Umka program to access the file system, and the `implLibsEnabled` flag allows it to use UMIs. If `warningCallback` is not `NULL`, it will be called on every warning. Returns `true` if the source has been successfully loaded.
 
 ```
 UMKA_API bool umkaAddModule(void *umka, const char *fileName, const char *sourceString);

src/umka.c

@@ -21,7 +21,6 @@ void help(void)
     printf("Usage: umka [<parameters>] <file.um> [<script-parameters>]\n");
     printf("Parameters:\n");
     printf("    -stack <stack-size>     - Set stack size\n");
-    printf("    -locale <locale-string> - Set locale\n");
     printf("    -asm                    - Write assembly listing\n");
     printf("    -check                  - Compile only\n");
     printf("    -warn                   - Enable warnings\n");
@@ -96,7 +95,6 @@ int main(int argc, char **argv)
 {
     // Parse interpreter parameters
     int stackSize       = DEFAULT_STACK_SIZE;
-    const char *locale  = NULL;
     bool writeAsm       = false;
     bool compileOnly    = false;
     bool printWarnings  = false;
@@ -122,18 +120,6 @@ int main(int argc, char **argv)
 
             i += 2;
         }
-        else if (strcmp(argv[i], "-locale") == 0)
-        {
-            if (i + 1 == argc)
-            {
-                fprintf(stderr, "No locale string\n");
-                return 1;
-            }
-
-            locale = argv[i + 1];
-
-            i += 2;
-        }
         else if (strcmp(argv[i], "-asm") == 0)
         {
             writeAsm = true;
@@ -166,7 +152,7 @@ int main(int argc, char **argv)
     }
 
     void *umka = umkaAlloc();
-    bool ok = umkaInit(umka, argv[i], NULL, stackSize, locale, argc - i, argv + i, !isSandbox, !isSandbox, printWarnings ? printCompileWarning : NULL);
+    bool ok = umkaInit(umka, argv[i], NULL, stackSize, NULL, argc - i, argv + i, !isSandbox, !isSandbox, printWarnings ? printCompileWarning : NULL);
     int exitCode = 0;
 
     if (ok)

src/umka_api.c

@@ -81,7 +81,7 @@ UMKA_API void *umkaAlloc(void)
 }
 
 
-UMKA_API bool umkaInit(void *umka, const char *fileName, const char *sourceString, int stackSize, const char *locale, int argc, char **argv, bool fileSystemEnabled, bool implLibsEnabled, UmkaWarningCallback warningCallback)
+UMKA_API bool umkaInit(void *umka, const char *fileName, const char *sourceString, int stackSize, void *reserved, int argc, char **argv, bool fileSystemEnabled, bool implLibsEnabled, UmkaWarningCallback warningCallback)
 {
     Compiler *comp = umka;
     memset(comp, 0, sizeof(Compiler));
@@ -95,7 +95,7 @@ UMKA_API bool umkaInit(void *umka, const char *fileName, const char *sourceStrin
 
     if (setjmp(comp->error.jumper) == 0)
     {
-        compilerInit(comp, fileName, sourceString, stackSize, locale, argc, argv, fileSystemEnabled, implLibsEnabled);
+        compilerInit(comp, fileName, sourceString, stackSize, argc, argv, fileSystemEnabled, implLibsEnabled);
         return true;
     }
     return false;

src/umka_api.h

@@ -90,7 +90,7 @@ typedef void (*UmkaWarningCallback)(UmkaError *warning);
 typedef struct
 {
     void *(*umkaAlloc)            (void);
-    bool (*umkaInit)              (void *umka, const char *fileName, const char *sourceString, int stackSize, const char *locale, int argc, char **argv, bool fileSystemEnabled, bool implLibsEnabled, UmkaWarningCallback warningCallback);
+    bool (*umkaInit)              (void *umka, const char *fileName, const char *sourceString, int stackSize, void *reserved, int argc, char **argv, bool fileSystemEnabled, bool implLibsEnabled, UmkaWarningCallback warningCallback);
     bool (*umkaCompile)           (void *umka);
     int  (*umkaRun)               (void *umka);
     int  (*umkaCall)              (void *umka, int entryOffset, int numParamSlots, UmkaStackSlot *params, UmkaStackSlot *result);
@@ -116,7 +116,7 @@ typedef struct
 
 
 UMKA_API void *umkaAlloc            (void);
-UMKA_API bool umkaInit              (void *umka, const char *fileName, const char *sourceString, int stackSize, const char *locale, int argc, char **argv, bool fileSystemEnabled, bool implLibsEnabled, UmkaWarningCallback warningCallback);
+UMKA_API bool umkaInit              (void *umka, const char *fileName, const char *sourceString, int stackSize, void *reserved, int argc, char **argv, bool fileSystemEnabled, bool implLibsEnabled, UmkaWarningCallback warningCallback);
 UMKA_API bool umkaCompile           (void *umka);
 UMKA_API int  umkaRun               (void *umka);
 UMKA_API int  umkaCall              (void *umka, int entryOffset, int numParamSlots, UmkaStackSlot *params, UmkaStackSlot *result);

src/umka_compiler.c

@@ -4,7 +4,10 @@
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
-#include <locale.h>
+
+#ifdef _WIN32
+    #include <windows.h>
+#endif
 
 #include "umka_compiler.h"
 #include "umka_runtime_src.h"
@@ -177,8 +180,13 @@ static void compilerDeclareExternalFuncs(Compiler *comp, bool fileSystemEnabled)
 }
 
 
-void compilerInit(Compiler *comp, const char *fileName, const char *sourceString, int stackSize, const char *locale, int argc, char **argv, bool fileSystemEnabled, bool implLibsEnabled)
+void compilerInit(Compiler *comp, const char *fileName, const char *sourceString, int stackSize, int argc, char **argv, bool fileSystemEnabled, bool implLibsEnabled)
 {
+#ifdef _WIN32
+    comp->originalCodepage = GetConsoleOutputCP();
+    SetConsoleOutputCP(CP_UTF8);
+#endif
+
     compilerSetAPI(comp);
 
     storageInit  (&comp->storage);
@@ -203,9 +211,6 @@ void compilerInit(Compiler *comp, const char *fileName, const char *sourceString
 
     lexInit(&comp->lex, &comp->storage, &comp->debug, filePath, sourceString, &comp->error);
 
-    if (locale && !setlocale(LC_ALL, locale))
-        comp->error.handler(comp->error.context, "Cannot set locale");
-
     comp->argc  = argc;
     comp->argv  = argv;
 
@@ -252,6 +257,10 @@ void compilerFree(Compiler *comp)
     blocksFree   (&comp->blocks);
     moduleFree   (&comp->modules);
     storageFree  (&comp->storage);
+
+#ifdef _WIN32
+    SetConsoleOutputCP(comp->originalCodepage);
+#endif
 }
 
 

src/umka_compiler.h

@@ -46,10 +46,13 @@ typedef struct
     int argc;
     char **argv;
 
+    // Original codepage (Windows only)
+    unsigned int originalCodepage;
+
 } Compiler;
 
 
-void compilerInit       (Compiler *comp, const char *fileName, const char *sourceString, int stackSize, const char *locale, int argc, char **argv, bool fileSystemEnabled, bool implLibsEnabled);
+void compilerInit       (Compiler *comp, const char *fileName, const char *sourceString, int stackSize, int argc, char **argv, bool fileSystemEnabled, bool implLibsEnabled);
 void compilerFree       (Compiler *comp);
 void compilerCompile    (Compiler *comp);
 void compilerRun        (Compiler *comp);