[jsinterp] Refactor
- _if_statement - _for_loop - _do_loop - _while_loop - _return_statement - _with_statement - _switch_statement - _try_statement
This commit is contained in:
sulyi
parent
558290d2b5
commit
f7993a196a
@ -881,7 +881,7 @@ class TestJSInterpreterParser(unittest.TestCase):
|
||||
self.assertEqual(list(jsi.statements()), ast)
|
||||
|
||||
@unittest.skip('Test not yet implemented: missing ast')
|
||||
def test_funct_expr(self):
|
||||
def test_function_expression(self):
|
||||
# ASAP function expression test
|
||||
jsi = JSInterpreter('''
|
||||
function f() {
|
||||
@ -898,7 +898,6 @@ class TestJSInterpreterParser(unittest.TestCase):
|
||||
self.assertEqual(list(jsi.statements()), ast)
|
||||
|
||||
def test_object(self):
|
||||
# ASAP object literal test
|
||||
jsi = JSInterpreter('''
|
||||
function f() {
|
||||
var o = {
|
||||
@ -933,7 +932,6 @@ class TestJSInterpreterParser(unittest.TestCase):
|
||||
(Token.OPEXPR, [
|
||||
(Token.MEMBER, (Token.RSV, 'this'), None, (Token.FIELD, 'a', None))
|
||||
]),
|
||||
|
||||
(Token.ASSIGN, None, (Token.OPEXPR, [
|
||||
(Token.MEMBER, (Token.ID, 'x'), None, None),
|
||||
(Token.MEMBER, (Token.INT, 2), None, None),
|
||||
@ -941,7 +939,6 @@ class TestJSInterpreterParser(unittest.TestCase):
|
||||
]), None))
|
||||
])
|
||||
])))
|
||||
|
||||
]),
|
||||
None, None)
|
||||
]), None)]
|
||||
@ -951,8 +948,7 @@ class TestJSInterpreterParser(unittest.TestCase):
|
||||
(Token.MEMBER, (Token.ID, 'o'), None, None)]), None)]))
|
||||
]))
|
||||
]
|
||||
result = list(jsi.statements())
|
||||
self.assertEqual(list(traverse(result)), list(traverse(ast)))
|
||||
self.assertEqual(list(traverse(list(jsi.statements()))), list(traverse(ast)))
|
||||
|
||||
@unittest.skip('Test not yet implemented: missing code and ast')
|
||||
def test_try(self):
|
||||
|
||||
@ -57,6 +57,15 @@ class JSInterpreter(object):
|
||||
self.context = Context(self.global_vars)
|
||||
self._context_stack = []
|
||||
|
||||
def statements(self, code=None, pos=0, stack_size=100):
|
||||
if code is None:
|
||||
code = self.code
|
||||
ts = TokenStream(code, pos)
|
||||
|
||||
while not ts.ended:
|
||||
yield self._next_statement(ts, stack_size)
|
||||
raise StopIteration
|
||||
|
||||
def _next_statement(self, token_stream, stack_top):
|
||||
if stack_top < 0:
|
||||
raise ExtractorError('Recursion limit reached')
|
||||
@ -76,6 +85,7 @@ class JSInterpreter(object):
|
||||
|
||||
# block
|
||||
elif token_id is Token.COPEN:
|
||||
# XXX refactor will deprecate some _next_statement calls
|
||||
open_pos = token_pos
|
||||
token_stream.pop()
|
||||
block = []
|
||||
@ -121,10 +131,99 @@ class JSInterpreter(object):
|
||||
# - token_id is Token.CCLOSE
|
||||
# - check line terminator
|
||||
# - restricted token
|
||||
raise ExtractorError('Unexpected sequence %s at %d' % (peek_value, peek_pos))
|
||||
raise ExtractorError('Unexpected sequence at %d' % peek_pos)
|
||||
statement = (Token.VAR, zip(variables, init))
|
||||
|
||||
elif token_value == 'if':
|
||||
statement = self._if_statement(token_stream, stack_top - 1)
|
||||
|
||||
elif token_value is 'for':
|
||||
statement = self._for_loop(token_stream, stack_top - 1)
|
||||
|
||||
elif token_value is 'do':
|
||||
statement = self._do_loop(token_stream, stack_top - 1)
|
||||
|
||||
elif token_value is 'while':
|
||||
statement = self._while_loop(token_stream, stack_top - 1)
|
||||
|
||||
elif token_value in ('break', 'continue'):
|
||||
token_stream.pop()
|
||||
token = {'break': Token.BREAK, 'continue': Token.CONTINUE}[token_value]
|
||||
peek_id, peek_value, peek_pos = token_stream.peek()
|
||||
# XXX no line break here
|
||||
label_name = None
|
||||
if peek_id is not Token.END:
|
||||
token_stream.chk_id()
|
||||
label_name = peek_value
|
||||
token_stream.pop()
|
||||
statement = (token, label_name)
|
||||
peek_id, peek_value, peek_pos = token_stream.peek()
|
||||
if peek_id is Token.END:
|
||||
token_stream.pop()
|
||||
else:
|
||||
# FIXME automatic end insertion
|
||||
raise ExtractorError('Unexpected sequence at %d' % peek_pos)
|
||||
|
||||
elif token_value == 'return':
|
||||
statement = self._return_statement(token_stream, stack_top - 1)
|
||||
peek_id, peek_value, peek_pos = token_stream.peek()
|
||||
if peek_id is Token.END:
|
||||
token_stream.pop()
|
||||
else:
|
||||
# FIXME automatic end insertion
|
||||
raise ExtractorError('Unexpected sequence at %d' % peek_pos)
|
||||
|
||||
elif token_value == 'with':
|
||||
statement = self._with_statement(token_stream, stack_top - 1)
|
||||
|
||||
elif token_value == 'switch':
|
||||
statement = self._switch_statement(token_stream, stack_top - 1)
|
||||
|
||||
elif token_value == 'throw':
|
||||
token_stream.pop()
|
||||
# XXX no line break here
|
||||
expr = self._expression(token_stream, stack_top - 1)
|
||||
statement = (Token.RETURN, expr)
|
||||
peek_id, peek_value, peek_pos = token_stream.peek()
|
||||
if peek_id is Token.END:
|
||||
token_stream.pop()
|
||||
else:
|
||||
# FIXME automatic end insertion
|
||||
raise ExtractorError('Unexpected sequence at %d' % peek_pos)
|
||||
|
||||
elif token_value == 'try':
|
||||
statement = self._try_statement(token_stream, stack_top - 1)
|
||||
|
||||
elif token_value == 'debugger':
|
||||
token_stream.pop()
|
||||
statement = (Token.DEBUG)
|
||||
peek_id, peek_value, peek_pos = token_stream.peek()
|
||||
if peek_id is Token.END:
|
||||
token_stream.pop()
|
||||
else:
|
||||
# FIXME automatic end insertion
|
||||
raise ExtractorError('Unexpected sequence at %d' % peek_pos)
|
||||
else: # label
|
||||
# XXX possible refactoring (this is the only branch not poping)
|
||||
token_id, token_value, token_pos = token_stream.peek(2)
|
||||
if token_id is Token.COLON:
|
||||
token_id, label_name, token_pos = token_stream.pop(2)
|
||||
token_stream.chk_id(last=True)
|
||||
statement = (Token.LABEL, label_name, self._next_statement(token_stream, stack_top - 1))
|
||||
|
||||
# expr
|
||||
if statement is None:
|
||||
statement = self._expression(token_stream, stack_top - 1)
|
||||
peek_id, peek_value, peek_pos = token_stream.peek()
|
||||
if peek_id is Token.END:
|
||||
token_stream.pop()
|
||||
else:
|
||||
# FIXME automatic end insertion
|
||||
raise ExtractorError('Unexpected sequence at %d' % peek_pos)
|
||||
|
||||
return statement
|
||||
|
||||
def _if_statement(self, token_stream, stack_top):
|
||||
token_stream.pop()
|
||||
token_id, token_value, token_pos = token_stream.pop()
|
||||
if token_id is not Token.POPEN:
|
||||
@ -137,17 +236,15 @@ class JSInterpreter(object):
|
||||
if token_id is Token.ID and token_value == 'else':
|
||||
token_stream.pop()
|
||||
false_expr = self._next_statement(token_stream, stack_top - 1)
|
||||
statement = (Token.IF, cond_expr, true_expr, false_expr)
|
||||
return (Token.IF, cond_expr, true_expr, false_expr)
|
||||
|
||||
elif token_value is 'for':
|
||||
def _for_loop(self, token_stream, stack_top):
|
||||
token_stream.pop()
|
||||
|
||||
token_id, token_value, token_pos = token_stream.pop()
|
||||
if token_id is not Token.POPEN:
|
||||
raise ExtractorError('''Expected '(' at %d''' % token_pos)
|
||||
|
||||
# FIXME set infor True (checked by variable declaration and relation expression)
|
||||
|
||||
token_id, token_value, token_pos = token_stream.peek()
|
||||
if token_id is Token.END:
|
||||
init = None
|
||||
@ -156,7 +253,6 @@ class JSInterpreter(object):
|
||||
init = self._next_statement(token_stream, stack_top - 1)
|
||||
else:
|
||||
init = self._expression(token_stream, stack_top - 1)
|
||||
|
||||
token_id, token_value, token_pos = token_stream.pop()
|
||||
if token_id is Token.IN:
|
||||
cond = self._expression(token_stream, stack_top - 1)
|
||||
@ -175,111 +271,72 @@ class JSInterpreter(object):
|
||||
incr = None if token_id is Token.END else self._expression(token_stream, stack_top - 1)
|
||||
else:
|
||||
raise ExtractorError('Invalid condition in for loop initialization at %d' % token_pos)
|
||||
|
||||
token_id, token_value, token_pos = token_stream.pop()
|
||||
if token_id is not Token.PCLOSE:
|
||||
raise ExtractorError('''Expected ')' at %d''' % token_pos)
|
||||
|
||||
body = self._next_statement(token_stream, stack_top - 1)
|
||||
return (Token.FOR, init, cond, incr, body)
|
||||
|
||||
statement = (Token.FOR, init, cond, incr, body)
|
||||
|
||||
elif token_value is 'do':
|
||||
def _do_loop(self, token_stream, stack_top):
|
||||
token_stream.pop()
|
||||
body = self._next_statement(token_stream, stack_top)
|
||||
|
||||
body = self._next_statement(token_stream, stack_top - 1)
|
||||
token_id, token_value, token_pos = token_stream.pop()
|
||||
if token_id is not Token.ID and token_value != 'while':
|
||||
raise ExtractorError('''Expected 'while' at %d''' % token_pos)
|
||||
|
||||
token_id, token_value, token_pos = token_stream.pop()
|
||||
if token_id is not Token.POPEN:
|
||||
raise ExtractorError('''Expected '(' at %d''' % token_pos)
|
||||
|
||||
expr = self._expression(token_stream, stack_top - 1)
|
||||
|
||||
token_id, token_value, token_pos = token_stream.pop()
|
||||
if token_id is not Token.PCLOSE:
|
||||
raise ExtractorError('''Expected ')' at %d''' % token_pos)
|
||||
|
||||
statement = (Token.DO, expr, body)
|
||||
|
||||
peek_id, peek_value, peek_pos = token_stream.peek()
|
||||
if peek_id is Token.END:
|
||||
token_stream.pop()
|
||||
else:
|
||||
# FIXME automatic end insertion
|
||||
raise ExtractorError('Unexpected sequence %s at %d' % (peek_value, peek_pos))
|
||||
raise ExtractorError('''Expected ';' at %d''' % peek_pos)
|
||||
return (Token.DO, expr, body)
|
||||
|
||||
elif token_value is 'while':
|
||||
def _while_loop(self, token_stream, stack_top):
|
||||
token_stream.pop()
|
||||
|
||||
token_id, token_value, token_pos = token_stream.pop()
|
||||
if token_id is not Token.POPEN:
|
||||
raise ExtractorError('''Expected '(' at %d''' % token_pos)
|
||||
|
||||
expr = self._expression(token_stream, stack_top - 1)
|
||||
|
||||
token_id, token_value, token_pos = token_stream.pop()
|
||||
if token_id is not Token.PCLOSE:
|
||||
raise ExtractorError('''Expected ')' at %d''' % token_pos)
|
||||
|
||||
body = self._next_statement(token_stream, stack_top)
|
||||
statement = (Token.DO, expr, body)
|
||||
return (Token.DO, expr, body)
|
||||
|
||||
elif token_value in ('break', 'continue'):
|
||||
token_stream.pop()
|
||||
token = {'break': Token.BREAK, 'continue': Token.CONTINUE}[token_value]
|
||||
peek_id, peek_value, peek_pos = token_stream.peek()
|
||||
# XXX no line break here
|
||||
label_name = None
|
||||
if peek_id is not Token.END:
|
||||
token_stream.chk_id()
|
||||
label_name = peek_value
|
||||
token_stream.pop()
|
||||
statement = (token, label_name)
|
||||
peek_id, peek_value, peek_pos = token_stream.peek()
|
||||
if peek_id is Token.END:
|
||||
token_stream.pop()
|
||||
else:
|
||||
# FIXME automatic end insertion
|
||||
raise ExtractorError('Unexpected sequence %s at %d' % (peek_value, peek_pos))
|
||||
|
||||
elif token_value == 'return':
|
||||
def _return_statement(self, token_stream, stack_top):
|
||||
token_stream.pop()
|
||||
peek_id, peek_value, peek_pos = token_stream.peek()
|
||||
# XXX no line break here
|
||||
expr = self._expression(token_stream, stack_top - 1) if peek_id is not Token.END else None
|
||||
statement = (Token.RETURN, expr)
|
||||
peek_id, peek_value, peek_pos = token_stream.peek()
|
||||
if peek_id is Token.END:
|
||||
token_stream.pop()
|
||||
else:
|
||||
# FIXME automatic end insertion
|
||||
raise ExtractorError('Unexpected sequence %s at %d' % (peek_value, peek_pos))
|
||||
return (Token.RETURN, expr)
|
||||
|
||||
elif token_value == 'with':
|
||||
def _with_statement(self, token_stream, stack_top):
|
||||
token_stream.pop()
|
||||
token_id, token_value, token_pos = token_stream.pop()
|
||||
if token_id is not Token.POPEN:
|
||||
raise ExtractorError('Missing expression at %d' % token_pos)
|
||||
expr = self._expression(token_stream, stack_top - 1)
|
||||
token_stream.pop() # Token.PCLOSE
|
||||
statement = (Token.WITH, expr, self._next_statement(token_stream, stack_top - 1))
|
||||
return (Token.WITH, expr, self._next_statement(token_stream, stack_top - 1))
|
||||
|
||||
elif token_value == 'switch':
|
||||
def _switch_statement(self, token_stream, stack_top):
|
||||
token_stream.pop()
|
||||
token_id, token_value, token_pos = token_stream.pop()
|
||||
if token_id is not Token.POPEN:
|
||||
raise ExtractorError('Missing expression at %d' % token_pos)
|
||||
discriminant = self._expression(token_stream, stack_top - 1)
|
||||
token_stream.pop() # Token.PCLOSE
|
||||
|
||||
token_id, token_value, token_pos = token_stream.pop()
|
||||
if token_id is not Token.COPEN:
|
||||
raise ExtractorError('Missing case block at %d' % token_pos)
|
||||
open_pos = token_pos
|
||||
|
||||
has_default = False
|
||||
block = []
|
||||
while True:
|
||||
@ -317,23 +374,10 @@ class JSInterpreter(object):
|
||||
statement_list.append(self._next_statement(token_stream, stack_top - 1))
|
||||
|
||||
block.append((expr, statement_list))
|
||||
|
||||
token_stream.pop()
|
||||
statement = (Token.SWITCH, discriminant, block)
|
||||
return (Token.SWITCH, discriminant, block)
|
||||
|
||||
elif token_value == 'throw':
|
||||
token_stream.pop()
|
||||
# XXX no line break here
|
||||
expr = self._expression(token_stream, stack_top - 1)
|
||||
statement = (Token.RETURN, expr)
|
||||
peek_id, peek_value, peek_pos = token_stream.peek()
|
||||
if peek_id is Token.END:
|
||||
token_stream.pop()
|
||||
else:
|
||||
# FIXME automatic end insertion
|
||||
raise ExtractorError('Unexpected sequence %s at %d' % (peek_value, peek_pos))
|
||||
|
||||
elif token_value == 'try':
|
||||
def _try_statement(self, token_stream, stack_top):
|
||||
token_stream.pop()
|
||||
token_id, token_value, token_pos = token_stream.peek()
|
||||
if token_id is not Token.COPEN:
|
||||
@ -355,56 +399,15 @@ class JSInterpreter(object):
|
||||
if token_id is not Token.COPEN:
|
||||
raise ExtractorError('Block is expected at %d' % token_pos)
|
||||
catch_block = (error_name, self._next_statement(token_stream, stack_top - 1))
|
||||
|
||||
finally_block = None
|
||||
if token_id is Token.ID and token_value == 'finally':
|
||||
token_id, token_value, token_pos = token_stream.peek()
|
||||
if token_id is not Token.COPEN:
|
||||
raise ExtractorError('Block is expected at %d' % token_pos)
|
||||
finally_block = self._next_statement(token_stream, stack_top - 1)
|
||||
|
||||
if catch_block is None and finally_block is None:
|
||||
raise ExtractorError('Try statement is expecting catch or finally at %d' % token_pos)
|
||||
|
||||
statement = (Token.TRY, try_block, catch_block, finally_block)
|
||||
|
||||
elif token_value == 'debugger':
|
||||
token_stream.pop()
|
||||
statement = (Token.DEBUG)
|
||||
peek_id, peek_value, peek_pos = token_stream.peek()
|
||||
if peek_id is Token.END:
|
||||
token_stream.pop()
|
||||
else:
|
||||
# FIXME automatic end insertion
|
||||
raise ExtractorError('Unexpected sequence %s at %d' % (peek_value, peek_pos))
|
||||
else:
|
||||
# XXX possible refactoring (this is the only branch not poping)
|
||||
token_id, token_value, token_pos = token_stream.peek(2)
|
||||
if token_id is Token.COLON:
|
||||
token_id, label_name, token_pos = token_stream.pop(2)
|
||||
token_stream.chk_id(last=True)
|
||||
statement = (Token.LABEL, label_name, self._next_statement(token_stream, stack_top - 1))
|
||||
|
||||
# expr
|
||||
if statement is None:
|
||||
statement = self._expression(token_stream, stack_top - 1)
|
||||
peek_id, peek_value, peek_pos = token_stream.peek()
|
||||
if peek_id is Token.END:
|
||||
token_stream.pop()
|
||||
else:
|
||||
# FIXME automatic end insertion
|
||||
raise ExtractorError('Unexpected sequence %s at %d' % (peek_value, peek_pos))
|
||||
|
||||
return statement
|
||||
|
||||
def statements(self, code=None, pos=0, stack_size=100):
|
||||
if code is None:
|
||||
code = self.code
|
||||
ts = TokenStream(code, pos)
|
||||
|
||||
while not ts.ended:
|
||||
yield self._next_statement(ts, stack_size)
|
||||
raise StopIteration
|
||||
return (Token.TRY, try_block, catch_block, finally_block)
|
||||
|
||||
def _expression(self, token_stream, stack_top):
|
||||
expr_list = []
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user