diff options
author | Andy Wingo <wingo@pobox.com> | 2010-12-10 11:33:18 +0100 |
---|---|---|
committer | Ian Price <ianprice90@googlemail.com> | 2013-09-09 17:01:23 +0100 |
commit | a0cecd8ff2b98cac4864aacadd28747558d14973 (patch) | |
tree | fa2827e143be81076edd995df201dae690b709e5 /module/language/lua/parser.scm | |
parent | 32c58e2eddadff3939361124b0f81ab9c35c7a5a (diff) | |
download | guile-a0cecd8ff2b98cac4864aacadd28747558d14973.tar.gz |
lua/common cleanup
* module/language/lua/common.scm: Remove `or-eqv?'. Make a bit more
idiomatic.
* module/language/lua/compile-tree-il.scm:
* module/language/lua/lexer.scm:
* module/language/lua/parser.scm:
* module/language/lua/runtime.scm: Replace or-eqv? instances with memq
or memv.
Diffstat (limited to 'module/language/lua/parser.scm')
-rw-r--r-- | module/language/lua/parser.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/module/language/lua/parser.scm b/module/language/lua/parser.scm index 70a1f7a8a..94e2a7895 100644 --- a/module/language/lua/parser.scm +++ b/module/language/lua/parser.scm @@ -121,7 +121,7 @@ (define (end-of-chunk? token) "Returns true if TOKEN denotes the end of a grammatical chunk." - (or (or-eqv? token #:else #:elseif #:end #:until) (eof-object? token))) + (or (memq token '(#:else #:elseif #:end #:until)) (eof-object? token))) (define (token/type t) (cond ((number? t) 'NUMBER) @@ -138,11 +138,11 @@ ;; infix operator parsing (define (binary-operator? t) "Return #t if the token may be a binary operator" - (or-eqv? t #\+ #\* #\/ #\- #\^ #\< #\> #:== #:~= #:and #:or #:concat)) + (memv t '(#\+ #\* #\/ #\- #\^ #\< #\> #:== #:~= #:and #:or #:concat))) (define (unary-operator? t) "Return #t if the token may be a unary operator" - (or-eqv? t #\- #\# #:not)) + (memv t '(#\- #\# #:not))) ;; Operator precedence (define *unary-priority* 80) @@ -817,7 +817,7 @@ (lookahead!) (if (eq? token2 #:=) (numeric-for src name) - (if (or-eqv? token2 #:in #\,) + (if (memv token2 '(#:in #\,)) (list-for src name) (syntax-error src "expected = or in after for variable")))))) result)) |