Yaltik/hy
2
0
Fork 0
Code Pull Requests Releases Activity

Add support for multi-line strings in interpreter

Browse Source
This commit is contained in:
Adam Schwalm 2014-12-28 17:36:31 -06:00
parent 706376277f
commit f1df108b31
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hy/lex/lexer.py
View File

@ -42,8 +42,9 @@ lg.add('UNQUOTE', r'~%s' % end_quote)
lg.add('HASHBANG', r'#!.*[^\r\n]') lg.add('HASHBANG', r'#!.*[^\r\n]')
lg.add('HASHREADER', r'#.') lg.add('HASHREADER', r'#.')
# A regexp which matches incomplete strings, used to support
lg.add('STRING', r'''(?x) # multi-line strings in the interpreter
partial_string = r'''(?x)
(?:u|r|ur|ru)? # prefix (?:u|r|ur|ru)? # prefix
" # start string " # start string
(?: (?:
@ -53,9 +54,10 @@ lg.add('STRING', r'''(?x)
| \\u[0-9a-fA-F]{4} # or unicode escape | \\u[0-9a-fA-F]{4} # or unicode escape
| \\U[0-9a-fA-F]{8} # or long unicode escape | \\U[0-9a-fA-F]{8} # or long unicode escape
)* # one or more times )* # one or more times
" # end string '''
''')
lg.add('STRING', r'%s"' % partial_string)
lg.add('PARTIAL_STRING', partial_string)
lg.add('IDENTIFIER', r'[^()\[\]{}\'"\s;]+') lg.add('IDENTIFIER', r'[^()\[\]{}\'"\s;]+')

6
hy/lex/parser.py
View File

@ -236,6 +236,12 @@ def t_string(p):
return uni_hystring(s) return uni_hystring(s)
@pg.production("string : PARTIAL_STRING")
def t_partial_string(p):
# Any unterminated string requires more input
raise PrematureEndOfInput("Premature end of input")
@pg.production("identifier : IDENTIFIER") @pg.production("identifier : IDENTIFIER")
@set_boundaries @set_boundaries
def t_identifier(p): def t_identifier(p):

7
tests/lex/test_lex.py
View File

@ -49,6 +49,11 @@ def test_lex_exception():
assert True is False assert True is False
except PrematureEndOfInput: except PrematureEndOfInput:
pass pass
try:
tokenize("(foo \"bar")
assert True is False
except PrematureEndOfInput:
pass
def test_unbalanced_exception(): def test_unbalanced_exception():
@ -73,7 +78,7 @@ def test_lex_expression_symbols():
def test_lex_expression_strings(): def test_lex_expression_strings():
""" Test that expressions can produce symbols """ """ Test that expressions can produce strings """
objs = tokenize("(foo \"bar\")") objs = tokenize("(foo \"bar\")")
assert objs == [HyExpression([HySymbol("foo"), HyString("bar")])] assert objs == [HyExpression([HySymbol("foo"), HyString("bar")])]