Bug 1933140 - [devtools] Add shared module for GenerateReservedWordsJS.py and GenerateReservedWords.py to read reserved words list. r=arai.

This adds a ReservedWordReader module that will return the list of reserved words
defined in ReservedWords.h.
This is especially helpful for devtools as we should automatically get any
new/updated keywords on the platform.

Differential Revision: https://phabricator.services.mozilla.com/D254938

Author: nchevobbe

devtools/shared/webconsole/GenerateReservedWordsJS.py

@@ -2,35 +2,27 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-import re
+import buildconfig
+import os
 import sys
 
-
-def read_reserved_word_list(filename):
-    macro_pat = re.compile(r"^\s*MACRO\(([^,]+), *[^,]+, *[^\)]+\)\s*\\?$")
-
-    reserved_word_list = []
-    with open(filename, "r") as f:
-        for line in f:
-            m = macro_pat.search(line)
-            if m:
-                reserved_word_list.append(m.group(1))
-
-    assert len(reserved_word_list) != 0
-
-    return reserved_word_list
+sys.path.append(os.path.join(buildconfig.topsrcdir, "js", "src", "frontend"))
+import ReservedWordReader
 
 
 def line(opt, s):
     opt["output"].write("{}\n".format(s))
 
 
-def main(output, reserved_words_h):
-    reserved_word_list = read_reserved_word_list(reserved_words_h)
+def main(output, reserved_words_h, *args):
+    reserved_word_list = ReservedWordReader.read_reserved_word_list(
+        reserved_words_h, *args
+    )
+
     opt = {"output": output}
 
     line(opt, "const JS_RESERVED_WORDS = [")
-    for word in reserved_word_list:
+    for index, word in reserved_word_list:
         line(opt, '  "{}",'.format(word))
     line(opt, "];")
     line(opt, "module.exports = JS_RESERVED_WORDS;")

devtools/shared/webconsole/moz.build

@@ -19,11 +19,25 @@ for dir in RELATIVEDIR.split("/"):
     base = base[dir]
 base += ["!reserved-js-words.js"]
 
-GeneratedFile(
-    "reserved-js-words.js",
-    script="GenerateReservedWordsJS.py",
-    inputs=["/js/src/frontend/ReservedWords.h"],
-)
+# Generate reserved-js-words.js from /js/src/frontend/ReservedWords.h
+flags = []
+if CONFIG["ENABLE_DECORATORS"]:
+    flags.append("--enable-decorators")
+if CONFIG["ENABLE_EXPLICIT_RESOURCE_MANAGEMENT"]:
+    flags.append("--enable-explicit-resource-management")
+if flags:
+    GeneratedFile(
+        "reserved-js-words.js",
+        script="GenerateReservedWordsJS.py",
+        inputs=["/js/src/frontend/ReservedWords.h"],
+        flags=flags,
+    )
+else:
+    GeneratedFile(
+        "reserved-js-words.js",
+        script="GenerateReservedWordsJS.py",
+        inputs=["/js/src/frontend/ReservedWords.h"],
+    )
 
 DevToolsModules(
     "analyze-input-string.js",

js/src/frontend/GenerateReservedWords.py

@@ -2,32 +2,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-import re
 import sys
 
-
-def read_reserved_word_list(
-    filename, enable_decorators, enable_explicit_resource_management
-):
-    macro_pat = re.compile(r"MACRO\(([^,]+), *[^,]+, *[^\)]+\)\s*\\?")
-
-    reserved_word_list = []
-    index = 0
-    with open(filename) as f:
-        for line in f:
-            m = macro_pat.search(line)
-            if m:
-                reserved_word = m.group(1)
-                if reserved_word == "accessor" and not enable_decorators:
-                    continue
-                if reserved_word == "using" and not enable_explicit_resource_management:
-                    continue
-                reserved_word_list.append((index, reserved_word))
-                index += 1
-
-    assert len(reserved_word_list) != 0
-
-    return reserved_word_list
+import ReservedWordReader
 
 
 def line(opt, s):
@@ -219,18 +196,8 @@ def generate_switch(opt, reserved_word_list):
 
 
 def main(output, reserved_words_h, *args):
-    enable_decorators = False
-    enable_explicit_resource_management = False
-    for arg in args:
-        if arg == "--enable-decorators":
-            enable_decorators = True
-        elif arg == "--enable-explicit-resource-management":
-            enable_explicit_resource_management = True
-        else:
-            raise ValueError("Unknown argument: " + arg)
-
-    reserved_word_list = read_reserved_word_list(
-        reserved_words_h, enable_decorators, enable_explicit_resource_management
+    reserved_word_list = ReservedWordReader.read_reserved_word_list(
+        reserved_words_h, *args
     )
 
     opt = {

js/src/frontend/ReservedWordReader.py

@@ -0,0 +1,39 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+import re
+
+
+def read_reserved_word_list(filename, *args):
+
+    enable_decorators = False
+    enable_explicit_resource_management = False
+
+    for arg in args:
+        if arg == "--enable-decorators":
+            enable_decorators = True
+        elif arg == "--enable-explicit-resource-management":
+            enable_explicit_resource_management = True
+        else:
+            raise ValueError("Unknown argument: " + arg)
+
+    macro_pat = re.compile(r"MACRO\(([^,]+), *[^,]+, *[^\)]+\)\s*\\?")
+
+    reserved_word_list = []
+    index = 0
+    with open(filename) as f:
+        for line in f:
+            m = macro_pat.search(line)
+            if m:
+                reserved_word = m.group(1)
+                if reserved_word == "accessor" and not enable_decorators:
+                    continue
+                if reserved_word == "using" and not enable_explicit_resource_management:
+                    continue
+                reserved_word_list.append((index, reserved_word))
+                index += 1
+
+    assert len(reserved_word_list) != 0
+
+    return reserved_word_list