summaryrefslogtreecommitdiff
path: root/module/language/lua
diff options
context:
space:
mode:
Diffstat (limited to 'module/language/lua')
-rw-r--r--module/language/lua/lexer.scm2
-rw-r--r--module/language/lua/notes.org6
-rw-r--r--module/language/lua/parser.scm6
3 files changed, 7 insertions, 7 deletions
diff --git a/module/language/lua/lexer.scm b/module/language/lua/lexer.scm
index 098905f05..17610da84 100644
--- a/module/language/lua/lexer.scm
+++ b/module/language/lua/lexer.scm
@@ -282,7 +282,7 @@ of an identifier"
(begin
(read-char)
(if (eqv? (peek-char) #\.)
- (begin (read-char) #:dots)
+ (begin (read-char) #:varargs)
#:concat))
#\.)))
diff --git a/module/language/lua/notes.org b/module/language/lua/notes.org
index 49f6b12fe..4e24cb95f 100644
--- a/module/language/lua/notes.org
+++ b/module/language/lua/notes.org
@@ -9,13 +9,13 @@ This is an org-mode todo list of stuff that needs to be done for Guile Lua.
** TODO Use prompt and abort instead of throw and catch
** TODO Standard library function: module
** TODO Standard library function: table.sort
-** TODO Get the official test suite running
+** TODO Get the official Lua 5.1 test suite running
* Eh
+** TODO Standard library function: math.frexp
+ Pending some additions to Guile's numeric tower.
** TODO Better testing of standard library modules io, os
** TODO Function environments (getfenv and setfenv)
-** TODO Parser should probably be rewritten
-
* Differences
Here are some difference in Guile Lua's behavior that should not cause
diff --git a/module/language/lua/parser.scm b/module/language/lua/parser.scm
index 52cf5a381..b602d20ab 100644
--- a/module/language/lua/parser.scm
+++ b/module/language/lua/parser.scm
@@ -125,7 +125,7 @@
(define *special-tokens*
'(#\. #\( #\) #\, #\- #\< #\; #\+ #\{ #\} #\[ #\] #\: #\#
#:function #:end #:if #:return #:elseif #:then #:else #:true #:false
- #:nil #:== #:~= #:= #\> #:>= #:<= #:local #:dots #:break #:do #:in
+ #:nil #:== #:~= #:= #\> #:>= #:<= #:local #:varargs #:break #:do #:in
#:and #:or))
(define (token/type t)
@@ -466,7 +466,7 @@
(values (reverse! parameters) #f))))
((#\))
(values (reverse! parameters) #f))
- ((#:dots)
+ ((#:varargs)
(advance!)
(values (reverse! parameters) #t))
(else
@@ -532,7 +532,7 @@
;; table-literal
((#\{) (table-literal))
;; ...
- ((#:dots)
+ ((#:varargs)
(unless *vararg-function*
(syntax-error src "cannot use '...' outside of a variable arguments function"))
(advance! (make-ast-variable-arguments src)))