Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve in-browser usage #186

Merged
merged 6 commits into from
Jan 27, 2019
Merged

improve in-browser usage #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0a3ea17
add init_mod()
valq7711 Dec 20, 2018
e46b591
Update rapydscript.pyj
valq7711 Dec 20, 2018
47423d6
Update rapydscript.pyj
valq7711 Dec 20, 2018
cf2610d
improve in-browser usage
valq7711 Dec 20, 2018
52bdef3
Update parser.pyj
valq7711 Dec 20, 2018
5fe1c52
Update parser.pyj
valq7711 Dec 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
330 changes: 171 additions & 159 deletions src/parser.pyj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,172 +20,181 @@ from utils import makePredicate, defaults, ImportError, js_error, RAPYD_PREFIX,
import ast
import tokenizer

NATIVE_CLASSES = None
COMMON_STATIC = None
CLASS_MAP = None
BASELIB = None
STDLIB = None

def array_to_hash(a):
ret = {}
for i in range(len(a)):
ret[a[i]] = True
return ret

NATIVE_CLASSES = {
# javascript
'Image': {},
'RegExp': {},
'Error': {},
'Object': {
static: [
"assign", # ES6
"getOwnPropertyNames",
"keys",
"create",
"defineProperty",
"defineProperties",
"getPrototypeOf", # ES6
"setPrototypeOf", # ES6
"getOwnPropertyDescriptor", # ES6
"getOwnPropertyDescriptors", # ES6

# experimental
"values",
"entries"
]
},
'String': {
static: [ "fromCharCode" ]
},
'Array': {
static: [ "isArray", "from", "of" ]
},
'Number': {
static: [ "isFinite", "isNaN" ]
},
'Function': {},
'Date': {
static: [ "UTC", "now", "parse" ]
},
'Boolean': {},
'ArrayBuffer': {
static: [ "isView", "transfer" ]
},
'DataView': {},
'Float32Array': {},
'Float64Array': {},
'Int16Array': {},
'Int32Array': {},
'Int8Array': {},
'Uint16Array': {},
'Uint32Array': {},
'Uint8Array': {},
'Uint8ClampedArray': {},
'Map': {}, # ES6
'WeakMap': {}, # ES6
'Set': {}, # ES6
'WeakSet': {}, # ES6
'Promise': { # ES6
static: [
"all",
"race",
"reject",
"resolve"
]
},

# baselib
"AssertionError": {},
"IndexError": {},
"KeyError": {},
"TypeError": {},
"ValueError": {},
}
COMMON_STATIC = [ "call", "apply", "bind", "toString" ]

CLASS_MAP = {} # top-level classes will be populated into here

# detect common python stdlib methods - these will be auto-injected into the code when called
BASELIB = { key: 0 for key in [
"abs",
"all",
"any",
"bin",
"bind",
"rebind_all",
"cmp",
"chr",
"dir",
"enumerate",
"eslice",
"extends",
"filter",
"hex",
"in",
"iterable",
"len",
"map",
"max",
"min",
"merge",
"mixin",
"print",
"range",
"reduce",
"reversed",
"sorted",
"sum",
"type",
"zip",
"getattr",
"setattr",
"hasattr",
"eq",
"kwargs",
"AssertionError",
"IndexError",
"KeyError",
"TypeError",
"ValueError"
]}
STDLIB = [
"abs",
"bin",
"cmp",
"chr",
"dir",
"hex",
"max",
"min",
"merge",
"mixin",
"print",
"range",
"reduce",
"getattr",
"setattr",
"hasattr",

# unique to RapydScript
"eq",
"bind",
"rebind_all",
"type",

# list operations
"all",
"any",
"enumerate",
"filter",
"len",
"map",
"reversed",
"sum",
"zip",

# errors
"AssertionError",
"IndexError",
"KeyError",
"TypeError",
"ValueError",
]
# it needs for reinitialization between in-browser compilations
def init_mod():
nonlocal NATIVE_CLASSES, COMMON_STATIC, CLASS_MAP, BASELIB, STDLIB

NATIVE_CLASSES = {
# javascript
'Image': {},
'RegExp': {},
'Error': {},
'Object': {
static: [
"assign", # ES6
"getOwnPropertyNames",
"keys",
"create",
"defineProperty",
"defineProperties",
"getPrototypeOf", # ES6
"setPrototypeOf", # ES6
"getOwnPropertyDescriptor", # ES6
"getOwnPropertyDescriptors", # ES6

# experimental
"values",
"entries"
]
},
'String': {
static: [ "fromCharCode" ]
},
'Array': {
static: [ "isArray", "from", "of" ]
},
'Number': {
static: [ "isFinite", "isNaN" ]
},
'Function': {},
'Date': {
static: [ "UTC", "now", "parse" ]
},
'Boolean': {},
'ArrayBuffer': {
static: [ "isView", "transfer" ]
},
'DataView': {},
'Float32Array': {},
'Float64Array': {},
'Int16Array': {},
'Int32Array': {},
'Int8Array': {},
'Uint16Array': {},
'Uint32Array': {},
'Uint8Array': {},
'Uint8ClampedArray': {},
'Map': {}, # ES6
'WeakMap': {}, # ES6
'Set': {}, # ES6
'WeakSet': {}, # ES6
'Promise': { # ES6
static: [
"all",
"race",
"reject",
"resolve"
]
},

# baselib
"AssertionError": {},
"IndexError": {},
"KeyError": {},
"TypeError": {},
"ValueError": {},
}
COMMON_STATIC = [ "call", "apply", "bind", "toString" ]

CLASS_MAP = {} # top-level classes will be populated into here

# detect common python stdlib methods - these will be auto-injected into the code when called
BASELIB = { key: 0 for key in [
"abs",
"all",
"any",
"bin",
"bind",
"rebind_all",
"cmp",
"chr",
"dir",
"enumerate",
"eslice",
"extends",
"filter",
"hex",
"in",
"iterable",
"len",
"map",
"max",
"min",
"merge",
"mixin",
"print",
"range",
"reduce",
"reversed",
"sorted",
"sum",
"type",
"zip",
"getattr",
"setattr",
"hasattr",
"eq",
"kwargs",
"AssertionError",
"IndexError",
"KeyError",
"TypeError",
"ValueError"
]}
STDLIB = [
"abs",
"bin",
"cmp",
"chr",
"dir",
"hex",
"max",
"min",
"merge",
"mixin",
"print",
"range",
"reduce",
"getattr",
"setattr",
"hasattr",

# unique to RapydScript
"eq",
"bind",
"rebind_all",
"type",

# list operations
"all",
"any",
"enumerate",
"filter",
"len",
"map",
"reversed",
"sum",
"zip",

# errors
"AssertionError",
"IndexError",
"KeyError",
"TypeError",
"ValueError",
]


def has_simple_decorator(decorators, name):
Expand Down Expand Up @@ -226,6 +235,9 @@ ATOMIC_START_TOKEN = array_to_hash([ "atom", "num", "string", "regexp", "name" ]

# -----[ Parser ]-----
def parse($TEXT, options):
if not STDLIB:
init_mod()

options = defaults(options, {
strict: False, # whether to use strict JavaScript mode
filename: None, # name of the file being parsed
Expand Down
21 changes: 10 additions & 11 deletions src/rapydscript.pyj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,10 @@ def splatBaselib(key, value):
})
})

browser_env = False
if not exports:
browser_env = not exports
if browser_env:
# browser environment
rapydscript = exports = {}
browser_env = True
rapydscript = exports = {}

exports.parse_baselib = exports.parseBaselib = def(srcPath, beautify):
try:
Expand Down Expand Up @@ -91,6 +90,12 @@ exports.get_import_dirs = def(paths_string, ignore_env):
# options are shared between input and output and irrelevant options are ignored
exports.compile = compile = def(code, options):
# parse

# because of the use of the same Rapydscript instance,
# we should re-initialize all static objects between compilations
if browser_env:
parser.init_mod()

toplevel = parser.parse(code, utils.defaults(options, {
toplevel: toplevel,
output: {}
Expand Down Expand Up @@ -174,10 +179,4 @@ exports.ALL_KEYWORDS = tokenizer.ALL_KEYWORDS
exports.IDENTIFIER_PAT = tokenizer.IDENTIFIER_PAT
exports.colored = utils.colored

# browser environment logic
if browser_env:
if JS('typeof define == "function"') and define.amd:
define([], def(): return exports;)
else:
window.rapydscript = exports

# browser environment logic - moved into self.pyj
Loading