aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/ChangeLog19
-rw-r--r--src/boot/scanner.boot55
-rw-r--r--src/boot/strap/scanner.clisp134
-rw-r--r--src/interp/database.boot4
4 files changed, 118 insertions, 94 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a4787328..786d22e7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,24 @@
2012-05-24 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * boot/scanner.boot (lexerLineLength): New.
+ (shoeNextLine): Use it in replacement of $sz.
+ (shoeLineToks): Likewise.
+ (shoeLispEscape): Likewise.
+ (shoeEsc): Likewise.
+ (shoeStartsComment): Likewise.
+ (shoeStartsNegComment): Likewise.
+ (shoeNegComment): Likewise.
+ (shoeComment): Likewise.
+ (shoePossFloat): Likewise.
+ (shoeSpace): Likewise.
+ (shoeS): Likewise.
+ (shoeW): Likewise.
+ (shoeInteger1): Likewise.
+ (shoeNumber): Likewise.
+ (shoeExponent): Likewise.
+
+2012-05-24 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* boot/scanner.boot (%Lexer): New record structure.
Add a lexer parameter to all lexing functions that need one.
Adjust their callers.
diff --git a/src/boot/scanner.boot b/src/boot/scanner.boot
index dad4f487..a87f5e48 100644
--- a/src/boot/scanner.boot
+++ b/src/boot/scanner.boot
@@ -69,6 +69,9 @@ structure %Lexer ==
makeLexer() ==
mk%Lexer(nil,nil)
+macro lexerLineLength lex ==
+ #lexerLineString lex
+
--%
shoeNextLine(lex,s) ==
@@ -77,7 +80,6 @@ shoeNextLine(lex,s) ==
[$f,:$r] := s
lexerLineString(lex) := sourceLineString $f
$n := firstNonblankPosition(lexerLineString lex,0)
- $sz := #lexerLineString lex
$n = nil => true
stringChar(lexerLineString lex,$n) = shoeTAB =>
a := makeString(7-($n rem 8),char " ")
@@ -91,7 +93,6 @@ shoeLineToks s ==
$f: local := nil
$r: local := nil
$n: local := nil
- $sz: local := nil
$floatok: local := true
$linepos: local := s
lex := makeLexer()
@@ -104,7 +105,7 @@ shoeLineToks s ==
command := shoeLisp? lexerLineString lex => shoeLispToken(lex,$r,command)
shoeLineToks $r
toks := []
- while $n < $sz repeat
+ while $n < lexerLineLength lex repeat
toks := dqAppend(toks,shoeToken lex)
toks = nil => shoeLineToks $r
[[toks],:$r]
@@ -121,7 +122,7 @@ shoeLispToken(lex,s,string)==
shoeAccumulateLines(lex,s,string)==
not shoeNextLine(lex,s) => [s,:string]
$n = nil => shoeAccumulateLines(lex,$r,string)
- #lexerLineString lex = 0 => shoeAccumulateLines(lex,$r,string)
+ lexerLineLength lex = 0 => shoeAccumulateLines(lex,$r,string)
stringChar(lexerLineString lex,0) = char ")" =>
command := shoeLisp? lexerLineString lex
command and #command > 0 =>
@@ -206,7 +207,7 @@ shoeLeafSpaces x ==
shoeLispEscape lex ==
$n := $n + 1
- $n >= $sz =>
+ $n >= lexerLineLength lex =>
SoftShoeError([$linepos,:$n],'"lisp escape error")
shoeLeafError stringChar(lexerLineString lex,$n)
a := shoeReadLispString(lexerLineString lex,$n)
@@ -215,7 +216,7 @@ shoeLispEscape lex ==
shoeLeafError stringChar(lexerLineString lex,$n)
[exp,n] := a
n = nil =>
- $n := $sz
+ $n := lexerLineLength lex
shoeLeafLispExp exp
$n := n
shoeLeafLispExp exp
@@ -226,7 +227,7 @@ shoeEscape lex ==
nil
shoeEsc lex ==
- $n >= $sz =>
+ $n >= lexerLineLength lex =>
shoeNextLine(lex,$r) =>
while $n = nil repeat shoeNextLine(lex,$r)
shoeEsc lex
@@ -242,31 +243,31 @@ shoeEsc lex ==
true
shoeStartsComment lex ==
- $n < $sz =>
+ $n < lexerLineLength lex =>
stringChar(lexerLineString lex,$n) = char "+" =>
www := $n + 1
- www >= $sz => false
+ www >= lexerLineLength lex => false
stringChar(lexerLineString lex,www) = char "+"
false
false
shoeStartsNegComment lex ==
- $n < $sz =>
+ $n < lexerLineLength lex =>
stringChar(lexerLineString lex,$n) = char "-" =>
www := $n + 1
- www >= $sz => false
+ www >= lexerLineLength lex => false
stringChar(lexerLineString lex,www) = char "-"
false
false
shoeNegComment lex ==
n := $n
- $n := $sz
+ $n := lexerLineLength lex
shoeLeafNegComment subString(lexerLineString lex,n)
shoeComment lex ==
n := $n
- $n := $sz
+ $n := lexerLineLength lex
shoeLeafComment subString(lexerLineString lex,n)
shoePunct lex ==
@@ -282,7 +283,7 @@ shoeKeyTr(lex,w) ==
shoeLeafKey w
shoePossFloat(lex,w)==
- $n >= $sz or not digit? stringChar(lexerLineString lex,$n) => shoeLeafKey w
+ $n >= lexerLineLength lex or not digit? stringChar(lexerLineString lex,$n) => shoeLeafKey w
w := shoeInteger lex
shoeExponent(lex,'"0",w)
@@ -292,7 +293,7 @@ shoeSpace lex ==
$floatok := true
$n = nil =>
shoeLeafSpaces 0
- $n:= # lexerLineString lex
+ $n:= lexerLineLength lex
shoeLeafSpaces ($n-n)
shoeString lex ==
@@ -301,15 +302,15 @@ shoeString lex ==
shoeLeafString shoeS lex
shoeS lex ==
- $n >= $sz =>
+ $n >= lexerLineLength lex =>
SoftShoeError([$linepos,:$n],'"quote added")
'""
n := $n
- strsym := charPosition(char "_"",lexerLineString lex,$n) or $sz
- escsym := charPosition(char "__",lexerLineString lex,$n) or $sz
+ strsym := charPosition(char "_"",lexerLineString lex,$n) or lexerLineLength lex
+ escsym := charPosition(char "__",lexerLineString lex,$n) or lexerLineLength lex
mn := MIN(strsym,escsym)
- mn=$sz =>
- $n := $sz
+ mn = lexerLineLength lex =>
+ $n := lexerLineLength lex
SoftShoeError([$linepos,:$n],'"quote added")
subString(lexerLineString lex,n)
mn = strsym =>
@@ -334,7 +335,7 @@ shoeIdEnd(line,n)==
shoeW(lex,b) ==
n1 := $n
$n := $n+1
- l := $sz
+ l := lexerLineLength lex
endid := shoeIdEnd(lexerLineString lex,$n)
endid = l or stringChar(lexerLineString lex,endid) ~= char "__" =>
$n := endid
@@ -362,7 +363,7 @@ shoeInteger lex ==
shoeInteger1(lex,zro) ==
n := $n
- l := $sz
+ l := lexerLineLength lex
while $n <l and digit? stringChar(lexerLineString lex,$n) repeat
$n := $n+1
$n = l or stringChar(lexerLineString lex,$n) ~= char "__" =>
@@ -384,11 +385,11 @@ shoeIntValue(s) ==
shoeNumber lex ==
a := shoeInteger lex
- $n >= $sz => shoeLeafInteger a
+ $n >= lexerLineLength lex => shoeLeafInteger a
$floatok and stringChar(lexerLineString lex,$n) = char "." =>
n := $n
$n := $n+1
- $n < $sz and stringChar(lexerLineString lex,$n) = char "." =>
+ $n < lexerLineLength lex and stringChar(lexerLineString lex,$n) = char "." =>
$n := n
shoeLeafInteger a
w := shoeInteger1(lex,true)
@@ -396,12 +397,12 @@ shoeNumber lex ==
shoeLeafInteger a
shoeExponent(lex,a,w)==
- $n >= $sz => shoeLeafFloat(a,w,0)
+ $n >= lexerLineLength lex => shoeLeafFloat(a,w,0)
n := $n
c := stringChar(lexerLineString lex,$n)
c = char "E" or c = char "e" =>
$n := $n+1
- $n >= $sz =>
+ $n >= lexerLineLength lex =>
$n := n
shoeLeafFloat(a,w,0)
digit? stringChar(lexerLineString lex,$n) =>
@@ -411,7 +412,7 @@ shoeExponent(lex,a,w)==
c1 := stringChar(lexerLineString lex,$n)
c1 = char "+" or c1 = char "-" =>
$n := $n+1
- $n >= $sz =>
+ $n >= lexerLineLength lex =>
$n := n
shoeLeafFloat(a,w,0)
digit? stringChar(lexerLineString lex,$n) =>
diff --git a/src/boot/strap/scanner.clisp b/src/boot/strap/scanner.clisp
index 0c899f53..e428c877 100644
--- a/src/boot/strap/scanner.clisp
+++ b/src/boot/strap/scanner.clisp
@@ -34,14 +34,17 @@
(DEFUN |makeLexer| () (|mk%Lexer| NIL NIL))
+(DEFMACRO |lexerLineLength| (|bfVar#1|)
+ (|applySubst| (LIST (CONS '|bfVar#1| |bfVar#1|))
+ '(LENGTH (|lexerLineString| |bfVar#1|))))
+
(DEFUN |shoeNextLine| (|lex| |s|)
(LET* (|s1| |a|)
- (DECLARE (SPECIAL |$sz| |$n| |$r| |$f| |$linepos|))
+ (DECLARE (SPECIAL |$n| |$r| |$f| |$linepos|))
(COND ((|bStreamNull| |s|) NIL)
(T (SETQ |$linepos| |s|) (SETQ |$f| (CAR |s|)) (SETQ |$r| (CDR |s|))
(SETF (|lexerLineString| |lex|) (|sourceLineString| |$f|))
(SETQ |$n| (|firstNonblankPosition| (|lexerLineString| |lex|) 0))
- (SETQ |$sz| (LENGTH (|lexerLineString| |lex|)))
(COND ((NULL |$n|) T)
((CHAR= (SCHAR (|lexerLineString| |lex|) |$n|) |shoeTAB|)
(SETQ |a| (|makeString| (- 7 (REM |$n| 8)) (|char| '| |)))
@@ -60,14 +63,13 @@
(LET* ((|$f| NIL)
(|$r| NIL)
(|$n| NIL)
- (|$sz| NIL)
(|$floatok| T)
(|$linepos| |s|)
|toks|
|dq|
|command|
|lex|)
- (DECLARE (SPECIAL |$f| |$r| |$n| |$sz| |$floatok| |$linepos|))
+ (DECLARE (SPECIAL |$f| |$r| |$n| |$floatok| |$linepos|))
(PROGN
(SETQ |lex| (|makeLexer|))
(COND ((NOT (|shoeNextLine| |lex| |s|)) (CONS NIL NIL))
@@ -84,7 +86,7 @@
(T (|shoeLineToks| |$r|))))
(T (SETQ |toks| NIL)
(LOOP
- (COND ((NOT (< |$n| |$sz|)) (RETURN NIL))
+ (COND ((NOT (< |$n| (|lexerLineLength| |lex|))) (RETURN NIL))
(T (SETQ |toks| (|dqAppend| |toks| (|shoeToken| |lex|))))))
(COND ((NULL |toks|) (|shoeLineToks| |$r|))
(T (CONS (LIST |toks|) |$r|))))))))
@@ -109,7 +111,7 @@
(DECLARE (SPECIAL |$r| |$n|))
(COND ((NOT (|shoeNextLine| |lex| |s|)) (CONS |s| |string|))
((NULL |$n|) (|shoeAccumulateLines| |lex| |$r| |string|))
- ((EQL (LENGTH (|lexerLineString| |lex|)) 0)
+ ((EQL (|lexerLineLength| |lex|) 0)
(|shoeAccumulateLines| |lex| |$r| |string|))
((CHAR= (SCHAR (|lexerLineString| |lex|) 0) (|char| '|)|))
(SETQ |command| (|shoeLisp?| (|lexerLineString| |lex|)))
@@ -185,11 +187,11 @@
(DEFUN |shoeLispEscape| (|lex|)
(LET* (|n| |exp| |a|)
- (DECLARE (SPECIAL |$linepos| |$sz| |$n|))
+ (DECLARE (SPECIAL |$linepos| |$n|))
(PROGN
(SETQ |$n| (+ |$n| 1))
(COND
- ((NOT (< |$n| |$sz|))
+ ((NOT (< |$n| (|lexerLineLength| |lex|)))
(|SoftShoeError| (CONS |$linepos| |$n|) "lisp escape error")
(|shoeLeafError| (SCHAR (|lexerLineString| |lex|) |$n|)))
(T (SETQ |a| (|shoeReadLispString| (|lexerLineString| |lex|) |$n|))
@@ -198,8 +200,10 @@
(|SoftShoeError| (CONS |$linepos| |$n|) "lisp escape error")
(|shoeLeafError| (SCHAR (|lexerLineString| |lex|) |$n|)))
(T (SETQ |exp| (CAR |a|)) (SETQ |n| (CADR |a|))
- (COND ((NULL |n|) (SETQ |$n| |$sz|) (|shoeLeafLispExp| |exp|))
- (T (SETQ |$n| |n|) (|shoeLeafLispExp| |exp|))))))))))
+ (COND
+ ((NULL |n|) (SETQ |$n| (|lexerLineLength| |lex|))
+ (|shoeLeafLispExp| |exp|))
+ (T (SETQ |$n| |n|) (|shoeLeafLispExp| |exp|))))))))))
(DEFUN |shoeEscape| (|lex|)
(DECLARE (SPECIAL |$n|))
@@ -209,9 +213,9 @@
(DEFUN |shoeEsc| (|lex|)
(LET* (|n1|)
- (DECLARE (SPECIAL |$r| |$sz| |$n|))
+ (DECLARE (SPECIAL |$r| |$n|))
(COND
- ((NOT (< |$n| |$sz|))
+ ((NOT (< |$n| (|lexerLineLength| |lex|)))
(COND
((|shoeNextLine| |lex| |$r|)
(LOOP (COND (|$n| (RETURN NIL)) (T (|shoeNextLine| |lex| |$r|))))
@@ -226,44 +230,44 @@
(DEFUN |shoeStartsComment| (|lex|)
(LET* (|www|)
- (DECLARE (SPECIAL |$sz| |$n|))
+ (DECLARE (SPECIAL |$n|))
(COND
- ((< |$n| |$sz|)
+ ((< |$n| (|lexerLineLength| |lex|))
(COND
((CHAR= (SCHAR (|lexerLineString| |lex|) |$n|) (|char| '+))
(SETQ |www| (+ |$n| 1))
- (COND ((NOT (< |www| |$sz|)) NIL)
+ (COND ((NOT (< |www| (|lexerLineLength| |lex|))) NIL)
(T (CHAR= (SCHAR (|lexerLineString| |lex|) |www|) (|char| '+)))))
(T NIL)))
(T NIL))))
(DEFUN |shoeStartsNegComment| (|lex|)
(LET* (|www|)
- (DECLARE (SPECIAL |$sz| |$n|))
+ (DECLARE (SPECIAL |$n|))
(COND
- ((< |$n| |$sz|)
+ ((< |$n| (|lexerLineLength| |lex|))
(COND
((CHAR= (SCHAR (|lexerLineString| |lex|) |$n|) (|char| '-))
(SETQ |www| (+ |$n| 1))
- (COND ((NOT (< |www| |$sz|)) NIL)
+ (COND ((NOT (< |www| (|lexerLineLength| |lex|))) NIL)
(T (CHAR= (SCHAR (|lexerLineString| |lex|) |www|) (|char| '-)))))
(T NIL)))
(T NIL))))
(DEFUN |shoeNegComment| (|lex|)
(LET* (|n|)
- (DECLARE (SPECIAL |$sz| |$n|))
+ (DECLARE (SPECIAL |$n|))
(PROGN
(SETQ |n| |$n|)
- (SETQ |$n| |$sz|)
+ (SETQ |$n| (|lexerLineLength| |lex|))
(|shoeLeafNegComment| (|subString| (|lexerLineString| |lex|) |n|)))))
(DEFUN |shoeComment| (|lex|)
(LET* (|n|)
- (DECLARE (SPECIAL |$sz| |$n|))
+ (DECLARE (SPECIAL |$n|))
(PROGN
(SETQ |n| |$n|)
- (SETQ |$n| |$sz|)
+ (SETQ |$n| (|lexerLineLength| |lex|))
(|shoeLeafComment| (|subString| (|lexerLineString| |lex|) |n|)))))
(DEFUN |shoePunct| (|lex|)
@@ -282,9 +286,9 @@
(T (SETQ |$floatok| (NOT (|shoeCloser| |w|))) (|shoeLeafKey| |w|))))
(DEFUN |shoePossFloat| (|lex| |w|)
- (DECLARE (SPECIAL |$sz| |$n|))
+ (DECLARE (SPECIAL |$n|))
(COND
- ((OR (NOT (< |$n| |$sz|))
+ ((OR (NOT (< |$n| (|lexerLineLength| |lex|)))
(NOT (DIGIT-CHAR-P (SCHAR (|lexerLineString| |lex|) |$n|))))
(|shoeLeafKey| |w|))
(T (SETQ |w| (|shoeInteger| |lex|)) (|shoeExponent| |lex| "0" |w|))))
@@ -297,8 +301,7 @@
(SETQ |$n| (|firstNonblankPosition| (|lexerLineString| |lex|) |$n|))
(SETQ |$floatok| T)
(COND
- ((NULL |$n|) (|shoeLeafSpaces| 0)
- (SETQ |$n| (LENGTH (|lexerLineString| |lex|))))
+ ((NULL |$n|) (|shoeLeafSpaces| 0) (SETQ |$n| (|lexerLineLength| |lex|)))
(T (|shoeLeafSpaces| (- |$n| |n|)))))))
(DEFUN |shoeString| (|lex|)
@@ -310,20 +313,21 @@
(DEFUN |shoeS| (|lex|)
(LET* (|b| |a| |str| |mn| |escsym| |strsym| |n|)
- (DECLARE (SPECIAL |$linepos| |$sz| |$n|))
+ (DECLARE (SPECIAL |$linepos| |$n|))
(COND
- ((NOT (< |$n| |$sz|))
+ ((NOT (< |$n| (|lexerLineLength| |lex|)))
(|SoftShoeError| (CONS |$linepos| |$n|) "quote added") "")
(T (SETQ |n| |$n|)
(SETQ |strsym|
(OR (|charPosition| (|char| '|"|) (|lexerLineString| |lex|) |$n|)
- |$sz|))
+ (|lexerLineLength| |lex|)))
(SETQ |escsym|
(OR (|charPosition| (|char| '_) (|lexerLineString| |lex|) |$n|)
- |$sz|))
+ (|lexerLineLength| |lex|)))
(SETQ |mn| (MIN |strsym| |escsym|))
(COND
- ((EQUAL |mn| |$sz|) (SETQ |$n| |$sz|)
+ ((EQUAL |mn| (|lexerLineLength| |lex|))
+ (SETQ |$n| (|lexerLineLength| |lex|))
(|SoftShoeError| (CONS |$linepos| |$n|) "quote added")
(|subString| (|lexerLineString| |lex|) |n|))
((EQUAL |mn| |strsym|) (SETQ |$n| (+ |mn| 1))
@@ -352,11 +356,11 @@
(DEFUN |shoeW| (|lex| |b|)
(LET* (|bb| |a| |str| |endid| |l| |n1|)
- (DECLARE (SPECIAL |$sz| |$n|))
+ (DECLARE (SPECIAL |$n|))
(PROGN
(SETQ |n1| |$n|)
(SETQ |$n| (+ |$n| 1))
- (SETQ |l| |$sz|)
+ (SETQ |l| (|lexerLineLength| |lex|))
(SETQ |endid| (|shoeIdEnd| (|lexerLineString| |lex|) |$n|))
(COND
((OR (EQUAL |endid| |l|)
@@ -386,10 +390,10 @@
(DEFUN |shoeInteger1| (|lex| |zro|)
(LET* (|bb| |a| |str| |l| |n|)
- (DECLARE (SPECIAL |$sz| |$n|))
+ (DECLARE (SPECIAL |$n|))
(PROGN
(SETQ |n| |$n|)
- (SETQ |l| |$sz|)
+ (SETQ |l| (|lexerLineLength| |lex|))
(LOOP
(COND
((NOT
@@ -421,15 +425,15 @@
(DEFUN |shoeNumber| (|lex|)
(LET* (|w| |n| |a|)
- (DECLARE (SPECIAL |$floatok| |$sz| |$n|))
+ (DECLARE (SPECIAL |$floatok| |$n|))
(PROGN
(SETQ |a| (|shoeInteger| |lex|))
- (COND ((NOT (< |$n| |$sz|)) (|shoeLeafInteger| |a|))
+ (COND ((NOT (< |$n| (|lexerLineLength| |lex|))) (|shoeLeafInteger| |a|))
((AND |$floatok|
(CHAR= (SCHAR (|lexerLineString| |lex|) |$n|) (|char| '|.|)))
(SETQ |n| |$n|) (SETQ |$n| (+ |$n| 1))
(COND
- ((AND (< |$n| |$sz|)
+ ((AND (< |$n| (|lexerLineLength| |lex|))
(CHAR= (SCHAR (|lexerLineString| |lex|) |$n|)
(|char| '|.|)))
(SETQ |$n| |n|) (|shoeLeafInteger| |a|))
@@ -439,33 +443,33 @@
(DEFUN |shoeExponent| (|lex| |a| |w|)
(LET* (|c1| |e| |c| |n|)
- (DECLARE (SPECIAL |$sz| |$n|))
- (COND ((NOT (< |$n| |$sz|)) (|shoeLeafFloat| |a| |w| 0))
- (T (SETQ |n| |$n|) (SETQ |c| (SCHAR (|lexerLineString| |lex|) |$n|))
- (COND
- ((OR (CHAR= |c| (|char| 'E)) (CHAR= |c| (|char| '|e|)))
- (SETQ |$n| (+ |$n| 1))
- (COND
- ((NOT (< |$n| |$sz|)) (SETQ |$n| |n|)
- (|shoeLeafFloat| |a| |w| 0))
- ((DIGIT-CHAR-P (SCHAR (|lexerLineString| |lex|) |$n|))
- (SETQ |e| (|shoeInteger| |lex|)) (SETQ |e| (|shoeIntValue| |e|))
- (|shoeLeafFloat| |a| |w| |e|))
- (T (SETQ |c1| (SCHAR (|lexerLineString| |lex|) |$n|))
- (COND
- ((OR (CHAR= |c1| (|char| '+)) (CHAR= |c1| (|char| '-)))
- (SETQ |$n| (+ |$n| 1))
- (COND
- ((NOT (< |$n| |$sz|)) (SETQ |$n| |n|)
- (|shoeLeafFloat| |a| |w| 0))
- ((DIGIT-CHAR-P (SCHAR (|lexerLineString| |lex|) |$n|))
- (SETQ |e| (|shoeInteger| |lex|))
- (SETQ |e| (|shoeIntValue| |e|))
- (|shoeLeafFloat| |a| |w|
- (COND ((CHAR= |c1| (|char| '-)) (- |e|))
- (T |e|))))
- (T (SETQ |$n| |n|) (|shoeLeafFloat| |a| |w| 0))))))))
- (T (|shoeLeafFloat| |a| |w| 0)))))))
+ (DECLARE (SPECIAL |$n|))
+ (COND
+ ((NOT (< |$n| (|lexerLineLength| |lex|))) (|shoeLeafFloat| |a| |w| 0))
+ (T (SETQ |n| |$n|) (SETQ |c| (SCHAR (|lexerLineString| |lex|) |$n|))
+ (COND
+ ((OR (CHAR= |c| (|char| 'E)) (CHAR= |c| (|char| '|e|)))
+ (SETQ |$n| (+ |$n| 1))
+ (COND
+ ((NOT (< |$n| (|lexerLineLength| |lex|))) (SETQ |$n| |n|)
+ (|shoeLeafFloat| |a| |w| 0))
+ ((DIGIT-CHAR-P (SCHAR (|lexerLineString| |lex|) |$n|))
+ (SETQ |e| (|shoeInteger| |lex|)) (SETQ |e| (|shoeIntValue| |e|))
+ (|shoeLeafFloat| |a| |w| |e|))
+ (T (SETQ |c1| (SCHAR (|lexerLineString| |lex|) |$n|))
+ (COND
+ ((OR (CHAR= |c1| (|char| '+)) (CHAR= |c1| (|char| '-)))
+ (SETQ |$n| (+ |$n| 1))
+ (COND
+ ((NOT (< |$n| (|lexerLineLength| |lex|))) (SETQ |$n| |n|)
+ (|shoeLeafFloat| |a| |w| 0))
+ ((DIGIT-CHAR-P (SCHAR (|lexerLineString| |lex|) |$n|))
+ (SETQ |e| (|shoeInteger| |lex|)) (SETQ |e| (|shoeIntValue| |e|))
+ (|shoeLeafFloat| |a| |w|
+ (COND ((CHAR= |c1| (|char| '-)) (- |e|))
+ (T |e|))))
+ (T (SETQ |$n| |n|) (|shoeLeafFloat| |a| |w| 0))))))))
+ (T (|shoeLeafFloat| |a| |w| 0)))))))
(DEFUN |shoeError| (|lex|)
(LET* (|n|)
diff --git a/src/interp/database.boot b/src/interp/database.boot
index 61040869..33e024e1 100644
--- a/src/interp/database.boot
+++ b/src/interp/database.boot
@@ -60,9 +60,9 @@ pathToDatabase name ==
--%
structure %Constructor ==
- Record(name: %Symbol,kind: %ConstructorKind,abbrev: %Symbol,
+ Record(id: %Symbol,kind: %ConstructorKind,abbrev: %Symbol,
xparms: %List %Symbol) with
- constructorName == (.name)
+ constructorIdentifier == (.id)
constructtorKind == (.kind)
constructrorAbbreviation == (.abbrev)
constructorExplicitParameters == (.xparms)
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 17:42:37 +0000