summaryrefslogtreecommitdiff
path: root/module/language/lua/parser.scm
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2010-12-10 18:27:46 +0100
committerIan Price <ianprice90@googlemail.com>2013-09-09 17:01:24 +0100
commit04175c7ddaec2694c43525fd41748760bafebbbc (patch)
tree0d0fce8c7b1d174e9130c2711f843bd8eacf3ed2 /module/language/lua/parser.scm
parentd87639dfe4d79792e9f5a6eaa797e125c8e54f54 (diff)
downloadguile-04175c7ddaec2694c43525fd41748760bafebbbc.tar.gz
lua/lexer tweaks
* module/language/lua/lexer.scm: Some tweaks and reindentations. Remove the define/init lexer interface; I don't like separating declaration and initialization. * module/language/lua/parser.scm: * test-suite/tests/lua-lexer.test: Adapt to lexer interface change.
Diffstat (limited to 'module/language/lua/parser.scm')
-rw-r--r--module/language/lua/parser.scm9
1 files changed, 5 insertions, 4 deletions
diff --git a/module/language/lua/parser.scm b/module/language/lua/parser.scm
index 875903b72..1a04f89da 100644
--- a/module/language/lua/parser.scm
+++ b/module/language/lua/parser.scm
@@ -197,8 +197,11 @@
;;;;; PARSER
(define (make-parser port)
- ;; Variables that will be set to the results of MAKE-LEXER.
- (define-lua-lexer get-source-info lexer)
+ (define lexer-pair
+ (call-with-values (lambda () (make-lexer port)) cons))
+
+ (define get-source-info (car lexer-pair))
+ (define lexer (cdr lexer-pair))
;; We need two tokens of lookahead
(define token2 #f)
@@ -843,8 +846,6 @@
(receive (is-last node) (statement)
(loop (or (end-of-chunk? token) is-last) (cons node tree)))))))
- (initialize-lua-lexer! port get-source-info lexer)
-
;; toplevel local environment
(enter-environment!)
;; read first token