src,tools: allow utf-8 in built-in js source code

PR-URL: https://github.com/nodejs/node/pull/5418
Reviewed-By: Trevor Norris <trev.norris@gmail.com>

1 files changed, 3 insertions, 20 deletions

diff --git a/tools/js2c.py b/tools/js2c.py
index ec9705ec6a..9c5878a668 100755
--- a/tools/js2c.py
+++ b/tools/js2c.py
@@ -42,24 +42,7 @@ import jsmin
 
 
 def ToCArray(filename, lines):
-  result = []
-  row = 1
-  col = 0
-  for chr in lines:
-    col += 1
-    if chr == "\n" or chr == "\r":
-      row += 1
-      col = 0
-
-    value = ord(chr)
-
-    if value >= 128:
-      print 'non-ascii value ' + filename + ':' + str(row) + ':' + str(col)
-      sys.exit(1);
-
-    result.append(str(value))
-  result.append("0")
-  return ", ".join(result)
+  return ','.join(str(ord(c)) for c in lines + '\0')
 
 
 def CompressScript(lines, do_jsmin):
@@ -220,7 +203,7 @@ namespace node {
 
 struct _native {
   const char* name;
-  const char* source;
+  const unsigned char* source;
   size_t source_len;
 };
 
@@ -242,7 +225,7 @@ NATIVE_DECLARATION = """\
 """
 
 SOURCE_DECLARATION = """\
-  const char %(escaped_id)s_native[] = { %(data)s };
+  const unsigned char %(escaped_id)s_native[] = { %(data)s };
 """