1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-01 12:20:26 +02:00

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.
This commit is contained in:
Andy Wingo 2010-12-10 18:27:46 +01:00 committed by Ian Price
parent d87639dfe4
commit 04175c7dda
3 changed files with 72 additions and 81 deletions

View file

@ -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