Create a scoped flag to select JS object vs hash literals

kovidgoyal · kovidgoyal · commit 13921aca0cbd · 2016-04-25T16:29:41.000+05:30
diff --git a/=template.pyj b/=template.pyj
@@ -1,4 +1,5 @@
 # vim:fileencoding=utf-8
 # License: BSD Copyright: %YEAR%, %USER% <%MAIL%>
+from __python__ import hash_literals
 
 %HERE%
diff --git a/src/ast.pyj b/src/ast.pyj
@@ -1,5 +1,6 @@
 # vim:fileencoding=utf-8
-# License: BSD
+# License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
+from __python__ import hash_literals
 
 from utils import noop, string_template
 
@@ -286,11 +287,12 @@ AST_SetComprehension = DEFNODE('SetComprehension', None, {
     '$documentation': 'A set comprehension',
 }, AST_ListComprehension)
 
-AST_DictComprehension = DEFNODE('DictComprehension', 'value_statement is_pydict', {
+AST_DictComprehension = DEFNODE('DictComprehension', 'value_statement is_pydict is_jshash', {
     '$documentation': 'A set comprehension',
     '$propdoc': {
         'value_statement': "[AST_Node] statement to perform on each value before returning it",
         'is_pydict': "[bool] True if this comprehension is for a python dict",
+        'is_jshash': "[bool] True if this comprehension is for a js hash",
     },
     '_walk': def(visitor):
         node = this
@@ -944,11 +946,12 @@ AST_Array = DEFNODE("Array", "elements", {
     ,
 })
 
-AST_Object = DEFNODE("Object", "properties is_pydict", {
+AST_Object = DEFNODE("Object", "properties is_pydict is_jshash", {
     '$documentation': "An object literal",
     '$propdoc': {
         'properties': "[AST_ObjectProperty*] array of properties",
-        'is_pydict': "[bool] True if this object is a python dict literal"
+        'is_pydict': "[bool] True if this object is a python dict literal",
+        'is_jshash': "[bool] True if this object is a js hash literal",
     },
     '_walk': def(visitor):
         node = this
diff --git a/src/errors.pyj b/src/errors.pyj
@@ -1,6 +1,6 @@
 # vim:fileencoding=utf-8
-# License: BSD
-# Copyright: 2015, Kovid Goyal <kovid at kovidgoyal.net>
+# License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
+from __python__ import hash_literals
 
 class SyntaxError(Error):
 
diff --git a/src/lib/gettext.pyj b/src/lib/gettext.pyj
@@ -518,7 +518,7 @@ def install(translation_data):
     t.install()
     return t
 
-has_prop = Object.prototype.hasOwnProperty
+has_prop = Object.prototype.hasOwnProperty.call.bind(Object.prototype.hasOwnProperty)
 
 class Translations:
 
@@ -536,14 +536,14 @@ class Translations:
     def gettext(self, text):
         for t in self.translations:
             m = t[0]['entries']
-            if has_prop.call(m, text):
+            if has_prop(m, text):
                 return m[text][0]
         return text
 
     def ngettext(self, text, plural, n):
         for t in self.translations:
             m = t[0]['entries']
-            if has_prop.call(m, text):
+            if has_prop(m, text):
                 idx = t[1](n)
                 return m[text][idx] or (text if n is 1 else plural)
         return text if n is 1 else plural
diff --git a/src/output/classes.pyj b/src/output/classes.pyj
@@ -1,5 +1,6 @@
 # vim:fileencoding=utf-8
 # License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
+from __python__ import hash_literals
 
 from ast import AST_Class, AST_Method
 from output.functions import decorate, function_definition, function_annotation
diff --git a/src/output/codegen.pyj b/src/output/codegen.pyj
@@ -1,5 +1,6 @@
 # vim:fileencoding=utf-8
-# License: BSD
+# License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
+from __python__ import hash_literals
 
 # globals:console,regenerate,writefile
 
@@ -20,7 +21,6 @@ from ast import (
     AST_Verbatim, AST_While, AST_With, AST_Yield, TreeWalker, AST_Existential
 )
 from output.exceptions import print_try, print_catch, print_finally
-from output.stream import OutputStream
 from output.classes import print_class
 from output.literals import print_array, print_obj_literal, print_object, print_set, print_regexp
 from output.loops import print_do_loop, print_while_loop, print_for_loop_body, print_for_in, print_list_comprehension
diff --git a/src/output/exceptions.pyj b/src/output/exceptions.pyj
@@ -1,5 +1,6 @@
 # vim:fileencoding=utf-8
 # License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
+from __python__ import hash_literals
 
 from output.statements import print_bracketed
 
diff --git a/src/output/functions.pyj b/src/output/functions.pyj
@@ -1,6 +1,7 @@
 # vim:fileencoding=utf-8
 # License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
 # globals:regenerate
+from __python__ import hash_literals
 
 from ast import AST_ClassCall, AST_New, has_calls, AST_Dot, AST_SymbolRef
 from output.stream import OutputStream
diff --git a/src/output/literals.pyj b/src/output/literals.pyj
@@ -1,5 +1,6 @@
 # vim:fileencoding=utf-8
 # License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
+from __python__ import hash_literals
 
 from ast import AST_Binary
 
@@ -30,7 +31,7 @@ def print_obj_literal(self, output):
             if self.is_pydict:
                 output.spaced.apply(output, 'var ρσ_d = ρσ_dict()'.split(' '))
             else:
-                output.spaced.apply(output, 'var ρσ_d = Object.create(null)'.split(' '))
+                output.spaced('var', 'ρσ_d', '=', ('Object.create(null)' if self.is_jshash else '{}'))
             output.end_statement()
             self.properties.forEach(def(prop, i):
                 output.indent()
@@ -65,7 +66,7 @@ def print_object(self, output):
         if self.properties.length > 0:
             print_obj_literal(self, output)
         else:
-            output.print("Object.create(null)")
+            output.print("Object.create(null)" if self.is_jshash else '{}')
 
 def print_set(self, output):
     if self.items.length is 0:
diff --git a/src/output/loops.pyj b/src/output/loops.pyj
@@ -1,6 +1,7 @@
 # vim:fileencoding=utf-8
 # License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
 # globals: regenerate
+from __python__ import hash_literals
 
 from ast import AST_BaseCall, AST_SymbolRef, AST_Array, AST_Unary, AST_Number, has_calls
 from output.stream import OutputStream
@@ -207,7 +208,7 @@ def print_for_in(self, output):
     self._do_print_body(output)
 
 def print_list_comprehension(self, output):
-    result_obj = {'ListComprehension':'[]', 'DictComprehension':'Object.create(null)', 'SetComprehension':'ρσ_set()'}[self.TYPE]
+    result_obj = {'ListComprehension':'[]', 'DictComprehension':('Object.create(null)' if self.is_jshash else '{}'), 'SetComprehension':'ρσ_set()'}[self.TYPE]
     is_generator = self.TYPE is 'GeneratorComprehension'
     es5 = output.option('js_version') is 5
     if self.TYPE is 'DictComprehension':
diff --git a/src/output/modules.pyj b/src/output/modules.pyj
@@ -1,6 +1,7 @@
 # vim:fileencoding=utf-8
 # License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
 # globals: writefile
+from __python__ import hash_literals
 
 from parse import COMPILER_VERSION
 from output.statements import declare_vars, display_body
diff --git a/src/output/operators.pyj b/src/output/operators.pyj
@@ -1,5 +1,6 @@
 # vim:fileencoding=utf-8
 # License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
+from __python__ import hash_literals
 
 from ast import (
     AST_Number, AST_Unary, AST_Seq, AST_Array, AST_Binary, AST_Set, AST_Object,
diff --git a/src/output/statements.pyj b/src/output/statements.pyj
@@ -1,5 +1,6 @@
 # vim:fileencoding=utf-8
 # License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
+from __python__ import hash_literals
 
 from ast import (
     AST_Definitions, AST_Scope, AST_Method, AST_Except, AST_EmptyStatement,
diff --git a/src/output/stream.pyj b/src/output/stream.pyj
@@ -1,6 +1,7 @@
 # vim:fileencoding=utf-8
 # License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
 # globals:regenerate
+from __python__ import hash_literals
 
 from utils import make_predicate, defaults, repeat_string
 from tokenizer import is_identifier_char
diff --git a/src/output/utils.pyj b/src/output/utils.pyj
@@ -1,5 +1,6 @@
 # vim:fileencoding=utf-8
 # License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
+from __python__ import hash_literals
 
 from ast import AST_BlockStatement
 
diff --git a/src/parse.pyj b/src/parse.pyj
@@ -1,5 +1,6 @@
 # vim:fileencoding=utf-8
-# License: BSD
+# License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
+from __python__ import hash_literals
 
 from utils import make_predicate, array_to_hash, defaults, has_prop
 from errors import SyntaxError, ImportError
@@ -25,7 +26,7 @@ from tokenizer import tokenizer, is_token, RESERVED_WORDS
 
 
 COMPILER_VERSION = '__COMPILER_VERSION__'
-PYTHON_FLAGS = {'dict_literals':True, 'overload_getitem':True, 'bound_methods':True}
+PYTHON_FLAGS = {'dict_literals':True, 'overload_getitem':True, 'bound_methods':True, 'hash_literals':True}
 
 NATIVE_CLASSES = {
     'Image': {},
@@ -752,7 +753,7 @@ def create_parser_ctx(S, import_dirs, module_id, baselib_items, imported_module_
             val = False if name.startsWith('no_') else True
             if not val:
                 name = name.slice(3)
-            if not has_prop(PYTHON_FLAGS, name):
+            if not PYTHON_FLAGS:
                 croak('Unknown __python__ flag: ' + name)
             S.scoped_flags.set(name, val)
             next()
@@ -1518,6 +1519,7 @@ def create_parser_ctx(S, import_dirs, module_id, baselib_items, imported_module_
         first = True
         has_non_const_keys = False
         is_pydict = S.scoped_flags.get('dict_literals', False)
+        is_jshash = S.scoped_flags.get('hash_literals', False)
         a = []
         while not is_("punc", "}"):
             if not first:
@@ -1551,12 +1553,13 @@ def create_parser_ctx(S, import_dirs, module_id, baselib_items, imported_module_
                 'end': prev()
             }))
             if a.length is 1 and is_('keyword', 'for'):
-                return dict_comprehension(a, is_pydict)
+                return dict_comprehension(a, is_pydict, is_jshash)
 
         next()
         return new (AST_ExpressiveObject if has_non_const_keys else AST_Object)({
             'properties': a,
             'is_pydict': is_pydict,
+            'is_jshash': is_jshash,
         })
 
     def set_(start, end, expr):
@@ -1587,7 +1590,7 @@ def create_parser_ctx(S, import_dirs, module_id, baselib_items, imported_module_
         S.in_comprehension = False
         return obj
 
-    def dict_comprehension(a, is_pydict):
+    def dict_comprehension(a, is_pydict, is_jshash):
         if a.length:
             left, right = a[0].key, a[0].value
         else:
@@ -1596,7 +1599,7 @@ def create_parser_ctx(S, import_dirs, module_id, baselib_items, imported_module_
                 return read_comprehension(new AST_SetComprehension({'statement':left}), '}')
             expect(':')
             right = expression(False)
-        return read_comprehension(new AST_DictComprehension({'statement':left, 'value_statement':right, 'is_pydict':is_pydict}), '}')
+        return read_comprehension(new AST_DictComprehension({'statement':left, 'value_statement':right, 'is_pydict':is_pydict, 'is_jshash':is_jshash}), '}')
 
     def as_name():
         tmp = S.token
diff --git a/src/tokenizer.pyj b/src/tokenizer.pyj
@@ -1,5 +1,6 @@
 # vim:fileencoding=utf-8
-# License: BSD
+# License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
+from __python__ import hash_literals
 
 from unicode_aliases import ALIAS_MAP
 from utils import make_predicate, characters
diff --git a/src/utils.pyj b/src/utils.pyj
@@ -1,5 +1,6 @@
 # vim:fileencoding=utf-8
-# License: BSD
+# License: BSD Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
+from __python__ import hash_literals
 
 has_prop = Object.prototype.hasOwnProperty.call.bind(Object.prototype.hasOwnProperty)
 
