v.3.0.0 contd

* fix a typo in python code (walking on lists/tuples used str keys while integer keys should be used) * js umd fallback if loaded as es6 module
foo123 · Mar 16, 2019 · 84acd83 · 84acd83
1 parent 12dc0cf
commit 84acd83
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/js/GrammarTemplate.js b/src/js/GrammarTemplate.js
@@ -18,7 +18,7 @@ else if ( ('function'===typeof define)&&define.amd&&('function'===typeof require
     define(name,['module'],function(module){factory.moduleUri = module.uri; return factory.call(root);});
 else if ( !(name in root) ) /* Browser/WebWorker/.. */
     (root[name] = factory.call(root)||1)&&('function'===typeof(define))&&define.amd&&define(function(){return root[name];} );
-}(  /* current root */          this, 
+}(  /* current root */          'undefined' !== typeof self ? self : this, 
     /* module name */           "GrammarTemplate",
     /* module factory */        function ModuleFactory__GrammarTemplate( undef ){
 "use strict";

diff --git a/src/js/GrammarTemplate.min.js b/src/js/GrammarTemplate.min.js
diff --git a/src/python/GrammarTemplate.py b/src/python/GrammarTemplate.py
@@ -61,7 +61,7 @@ def walk( obj, keys, keys_alt=None, obj_alt=None ):
             i += 1
             if o is not None:
                 if isinstance(o,(list,tuple)) and int(k)<len(o):
-                    o = o[k]
+                    o = o[int(k)]
                 elif isinstance(o,dict) and (k in o):
                     o = o[k]
                 else:
@@ -83,7 +83,7 @@ def walk( obj, keys, keys_alt=None, obj_alt=None ):
             i += 1
             if o is not None:
                 if isinstance(o,(list,tuple)) and int(k)<len(o):
-                    o = o[k]
+                    o = o[int(k)]
                 elif isinstance(o,dict) and (k in o):
                     o = o[k]
                 else:
@@ -106,7 +106,7 @@ def walk( obj, keys, keys_alt=None, obj_alt=None ):
                 i += 1
                 if o is not None:
                     if isinstance(o,(list,tuple)) and int(k)<len(o):
-                        o = o[k]
+                        o = o[int(k)]
                     elif isinstance(o,dict) and (k in o):
                         o = o[k]
                     else:
@@ -128,7 +128,7 @@ def walk( obj, keys, keys_alt=None, obj_alt=None ):
                 i += 1
                 if o is not None:
                     if isinstance(o,(list,tuple)) and int(k)<len(o):
-                        o = o[k]
+                        o = o[int(k)]
                     elif isinstance(o,dict) and (k in o):
                         o = o[k]
                     else: