Merge branch 'master' of https://github.com/jclc/wren into jclc-master

2018-04-28 10:00:59 -07:00
parent 8fae8e4f1e e66115c9fc
commit 4d056b6ec3
2 changed files with 9 additions and 1 deletions
@@ -3420,6 +3420,12 @@ void definition(Compiler* compiler)
 ObjFn* wrenCompile(WrenVM* vm, ObjModule* module, const char* source,
                   bool isExpression, bool printErrors)
 {
+  // Skip potential UTF-8 BOM
+  if (strncmp(source, "\xEF\xBB\xBF", 3) == 0)
+  {
+    source += 3;
+  }
+
  Parser parser;
  parser.vm = vm;
  parser.module = module;
@@ -3447,7 +3453,7 @@ ObjFn* wrenCompile(WrenVM* vm, ObjModule* module, const char* source,
  nextToken(&parser);

  int numExistingVariables = module->variables.count;
-  
+
  Compiler compiler;
  initCompiler(&compiler, &parser, NULL, false);
  ignoreNewlines(&compiler);
@@ -0,0 +1,2 @@
+// This file should have a UTF-8 byte order mark
+System.print("ok") // expect: ok