From 6daddccab40c5040b809d6c9842cdc7e9ae8cf8d Mon Sep 17 00:00:00 2001 From: dos-reis Date: Thu, 24 May 2012 14:25:36 +0000 Subject: change lexer line accessor name --- src/boot/scanner.boot | 104 ++++++++++++++++++++--------------------- src/boot/strap/scanner.clisp | 108 ++++++++++++++++++++++--------------------- 2 files changed, 107 insertions(+), 105 deletions(-) (limited to 'src') diff --git a/src/boot/scanner.boot b/src/boot/scanner.boot index 6dcbce92..dad4f487 100644 --- a/src/boot/scanner.boot +++ b/src/boot/scanner.boot @@ -63,7 +63,7 @@ dqToList s == --% structure %Lexer == Record(line: %String, pos: %Short) with - lexerInputLine == (.line) + lexerLineString == (.line) lexerCurrentPosition == (.pos) makeLexer() == @@ -75,15 +75,15 @@ shoeNextLine(lex,s) == bStreamNull s => false $linepos := s [$f,:$r] := s - lexerInputLine(lex) := sourceLineString $f - $n := firstNonblankPosition(lexerInputLine lex,0) - $sz := #lexerInputLine lex + lexerLineString(lex) := sourceLineString $f + $n := firstNonblankPosition(lexerLineString lex,0) + $sz := #lexerLineString lex $n = nil => true - stringChar(lexerInputLine lex,$n) = shoeTAB => + stringChar(lexerLineString lex,$n) = shoeTAB => a := makeString(7-($n rem 8),char " ") - stringChar(lexerInputLine lex,$n) := char " " - lexerInputLine(lex) := strconc(a,lexerInputLine lex) - s1 := [makeSourceLine(lexerInputLine lex,sourceLineNumber $f),:$r] + stringChar(lexerLineString lex,$n) := char " " + lexerLineString(lex) := strconc(a,lexerLineString lex) + s1 := [makeSourceLine(lexerLineString lex,sourceLineNumber $f),:$r] shoeNextLine(lex,s1) true @@ -97,11 +97,11 @@ shoeLineToks s == lex := makeLexer() not shoeNextLine(lex,s) => [nil,:nil] $n = nil => shoeLineToks $r - stringChar(lexerInputLine lex,0) = char ")" => - command := shoeLine? lexerInputLine lex => + stringChar(lexerLineString lex,0) = char ")" => + command := shoeLine? lexerLineString lex => dq := dqUnit makeToken($linepos,shoeLeafLine command,0) [[dq],:$r] - command := shoeLisp? lexerInputLine lex => shoeLispToken(lex,$r,command) + command := shoeLisp? lexerLineString lex => shoeLispToken(lex,$r,command) shoeLineToks $r toks := [] while $n < $sz repeat @@ -112,7 +112,7 @@ shoeLineToks s == shoeLispToken(lex,s,string)== if #string = 0 or stringChar(string,0) = char ";" then string := '"" - ln := lexerInputLine lex + ln := lexerLineString lex linepos := $linepos [r,:st] := shoeAccumulateLines(lex,s,string) dq := dqUnit makeToken(linepos,shoeLeafLisp st,0) @@ -121,9 +121,9 @@ shoeLispToken(lex,s,string)== shoeAccumulateLines(lex,s,string)== not shoeNextLine(lex,s) => [s,:string] $n = nil => shoeAccumulateLines(lex,$r,string) - #lexerInputLine lex = 0 => shoeAccumulateLines(lex,$r,string) - stringChar(lexerInputLine lex,0) = char ")" => - command := shoeLisp? lexerInputLine lex + #lexerLineString lex = 0 => shoeAccumulateLines(lex,$r,string) + stringChar(lexerLineString lex,0) = char ")" => + command := shoeLisp? lexerLineString lex command and #command > 0 => stringChar(command,0) = char ";" => shoeAccumulateLines(lex,$r,string) @@ -141,7 +141,7 @@ shoeCloser t == shoeToken lex == linepos := $linepos n := $n - ch := stringChar(lexerInputLine lex,$n) + ch := stringChar(lexerLineString lex,$n) b := shoeStartsComment lex => shoeComment lex @@ -208,11 +208,11 @@ shoeLispEscape lex == $n := $n + 1 $n >= $sz => SoftShoeError([$linepos,:$n],'"lisp escape error") - shoeLeafError stringChar(lexerInputLine lex,$n) - a := shoeReadLispString(lexerInputLine lex,$n) + shoeLeafError stringChar(lexerLineString lex,$n) + a := shoeReadLispString(lexerLineString lex,$n) a = nil => SoftShoeError([$linepos,:$n],'"lisp escape error") - shoeLeafError stringChar(lexerInputLine lex,$n) + shoeLeafError stringChar(lexerLineString lex,$n) [exp,n] := a n = nil => $n := $sz @@ -232,7 +232,7 @@ shoeEsc lex == shoeEsc lex false false - n1 := firstNonblankPosition(lexerInputLine lex,$n) + n1 := firstNonblankPosition(lexerLineString lex,$n) n1 = nil => shoeNextLine(lex,$r) while $n = nil repeat @@ -243,34 +243,34 @@ shoeEsc lex == shoeStartsComment lex == $n < $sz => - stringChar(lexerInputLine lex,$n) = char "+" => + stringChar(lexerLineString lex,$n) = char "+" => www := $n + 1 www >= $sz => false - stringChar(lexerInputLine lex,www) = char "+" + stringChar(lexerLineString lex,www) = char "+" false false shoeStartsNegComment lex == $n < $sz => - stringChar(lexerInputLine lex,$n) = char "-" => + stringChar(lexerLineString lex,$n) = char "-" => www := $n + 1 www >= $sz => false - stringChar(lexerInputLine lex,www) = char "-" + stringChar(lexerLineString lex,www) = char "-" false false shoeNegComment lex == n := $n $n := $sz - shoeLeafNegComment subString(lexerInputLine lex,n) + shoeLeafNegComment subString(lexerLineString lex,n) shoeComment lex == n := $n $n := $sz - shoeLeafComment subString(lexerInputLine lex,n) + shoeLeafComment subString(lexerLineString lex,n) shoePunct lex == - sss := shoeMatch(lexerInputLine lex,$n) + sss := shoeMatch(lexerLineString lex,$n) $n := $n + #sss shoeKeyTr(lex,sss) @@ -282,17 +282,17 @@ shoeKeyTr(lex,w) == shoeLeafKey w shoePossFloat(lex,w)== - $n >= $sz or not digit? stringChar(lexerInputLine lex,$n) => shoeLeafKey w + $n >= $sz or not digit? stringChar(lexerLineString lex,$n) => shoeLeafKey w w := shoeInteger lex shoeExponent(lex,'"0",w) shoeSpace lex == n := $n - $n := firstNonblankPosition(lexerInputLine lex,$n) + $n := firstNonblankPosition(lexerLineString lex,$n) $floatok := true $n = nil => shoeLeafSpaces 0 - $n:= # lexerInputLine lex + $n:= # lexerLineString lex shoeLeafSpaces ($n-n) shoeString lex == @@ -305,22 +305,22 @@ shoeS lex == SoftShoeError([$linepos,:$n],'"quote added") '"" n := $n - strsym := charPosition(char "_"",lexerInputLine lex,$n) or $sz - escsym := charPosition(char "__",lexerInputLine lex,$n) or $sz + strsym := charPosition(char "_"",lexerLineString lex,$n) or $sz + escsym := charPosition(char "__",lexerLineString lex,$n) or $sz mn := MIN(strsym,escsym) mn=$sz => $n := $sz SoftShoeError([$linepos,:$n],'"quote added") - subString(lexerInputLine lex,n) + subString(lexerLineString lex,n) mn = strsym => $n := mn + 1 - subString(lexerInputLine lex,n,mn-n) - str := subString(lexerInputLine lex,n,mn-n) + subString(lexerLineString lex,n,mn-n) + str := subString(lexerLineString lex,n,mn-n) $n := mn+1 a := shoeEsc lex b := a => - str := strconc(str,charString stringChar(lexerInputLine lex,$n)) + str := strconc(str,charString stringChar(lexerLineString lex,$n)) $n := $n + 1 shoeS lex shoeS lex @@ -335,11 +335,11 @@ shoeW(lex,b) == n1 := $n $n := $n+1 l := $sz - endid := shoeIdEnd(lexerInputLine lex,$n) - endid = l or stringChar(lexerInputLine lex,endid) ~= char "__" => + endid := shoeIdEnd(lexerLineString lex,$n) + endid = l or stringChar(lexerLineString lex,endid) ~= char "__" => $n := endid - [b,subString(lexerInputLine lex,n1,endid-n1)] - str := subString(lexerInputLine lex,n1,endid-n1) + [b,subString(lexerLineString lex,n1,endid-n1)] + str := subString(lexerLineString lex,n1,endid-n1) $n := endid+1 a := shoeEsc lex bb := @@ -363,12 +363,12 @@ shoeInteger lex == shoeInteger1(lex,zro) == n := $n l := $sz - while $n + $n = l or stringChar(lexerLineString lex,$n) ~= char "__" => n = $n and zro => '"0" - subString(lexerInputLine lex,n,$n - n) - str := subString(lexerInputLine lex,n,$n - n) + subString(lexerLineString lex,n,$n - n) + str := subString(lexerLineString lex,n,$n - n) $n := $n+1 a := shoeEsc lex bb := shoeInteger1(lex,zro) @@ -385,10 +385,10 @@ shoeIntValue(s) == shoeNumber lex == a := shoeInteger lex $n >= $sz => shoeLeafInteger a - $floatok and stringChar(lexerInputLine lex,$n) = char "." => + $floatok and stringChar(lexerLineString lex,$n) = char "." => n := $n $n := $n+1 - $n < $sz and stringChar(lexerInputLine lex,$n) = char "." => + $n < $sz and stringChar(lexerLineString lex,$n) = char "." => $n := n shoeLeafInteger a w := shoeInteger1(lex,true) @@ -398,23 +398,23 @@ shoeNumber lex == shoeExponent(lex,a,w)== $n >= $sz => shoeLeafFloat(a,w,0) n := $n - c := stringChar(lexerInputLine lex,$n) + c := stringChar(lexerLineString lex,$n) c = char "E" or c = char "e" => $n := $n+1 $n >= $sz => $n := n shoeLeafFloat(a,w,0) - digit? stringChar(lexerInputLine lex,$n) => + digit? stringChar(lexerLineString lex,$n) => e := shoeInteger lex e := shoeIntValue e shoeLeafFloat(a,w,e) - c1 := stringChar(lexerInputLine lex,$n) + c1 := stringChar(lexerLineString lex,$n) c1 = char "+" or c1 = char "-" => $n := $n+1 $n >= $sz => $n := n shoeLeafFloat(a,w,0) - digit? stringChar(lexerInputLine lex,$n) => + digit? stringChar(lexerLineString lex,$n) => e := shoeInteger lex e := shoeIntValue e shoeLeafFloat(a,w,(c1 = char "-" => MINUS e; e)) @@ -428,9 +428,9 @@ shoeError lex == $n := $n + 1 SoftShoeError([$linepos,:n], strconc( '"The character whose number is ", - toString codePoint stringChar(lexerInputLine lex,n), + toString codePoint stringChar(lexerLineString lex,n), '" is not a Boot character")) - shoeLeafError stringChar(lexerInputLine lex,n) + shoeLeafError stringChar(lexerLineString lex,n) shoeKeyWord st == tableValue(shoeKeyTable,st) diff --git a/src/boot/strap/scanner.clisp b/src/boot/strap/scanner.clisp index ba33e189..0c899f53 100644 --- a/src/boot/strap/scanner.clisp +++ b/src/boot/strap/scanner.clisp @@ -28,7 +28,7 @@ (DEFMACRO |mk%Lexer| (|line| |pos|) (LIST '|MAKE-%Lexer| :|line| |line| :|pos| |pos|)) -(DEFMACRO |lexerInputLine| (|bfVar#1|) (LIST '|%Lexer-line| |bfVar#1|)) +(DEFMACRO |lexerLineString| (|bfVar#1|) (LIST '|%Lexer-line| |bfVar#1|)) (DEFMACRO |lexerCurrentPosition| (|bfVar#1|) (LIST '|%Lexer-pos| |bfVar#1|)) @@ -39,18 +39,18 @@ (DECLARE (SPECIAL |$sz| |$n| |$r| |$f| |$linepos|)) (COND ((|bStreamNull| |s|) NIL) (T (SETQ |$linepos| |s|) (SETQ |$f| (CAR |s|)) (SETQ |$r| (CDR |s|)) - (SETF (|lexerInputLine| |lex|) (|sourceLineString| |$f|)) - (SETQ |$n| (|firstNonblankPosition| (|lexerInputLine| |lex|) 0)) - (SETQ |$sz| (LENGTH (|lexerInputLine| |lex|))) + (SETF (|lexerLineString| |lex|) (|sourceLineString| |$f|)) + (SETQ |$n| (|firstNonblankPosition| (|lexerLineString| |lex|) 0)) + (SETQ |$sz| (LENGTH (|lexerLineString| |lex|))) (COND ((NULL |$n|) T) - ((CHAR= (SCHAR (|lexerInputLine| |lex|) |$n|) |shoeTAB|) + ((CHAR= (SCHAR (|lexerLineString| |lex|) |$n|) |shoeTAB|) (SETQ |a| (|makeString| (- 7 (REM |$n| 8)) (|char| '| |))) - (SETF (SCHAR (|lexerInputLine| |lex|) |$n|) (|char| '| |)) - (SETF (|lexerInputLine| |lex|) - (CONCAT |a| (|lexerInputLine| |lex|))) + (SETF (SCHAR (|lexerLineString| |lex|) |$n|) (|char| '| |)) + (SETF (|lexerLineString| |lex|) + (CONCAT |a| (|lexerLineString| |lex|))) (SETQ |s1| (CONS - (|makeSourceLine| (|lexerInputLine| |lex|) + (|makeSourceLine| (|lexerLineString| |lex|) (|sourceLineNumber| |$f|)) |$r|)) (|shoeNextLine| |lex| |s1|)) @@ -72,14 +72,14 @@ (SETQ |lex| (|makeLexer|)) (COND ((NOT (|shoeNextLine| |lex| |s|)) (CONS NIL NIL)) ((NULL |$n|) (|shoeLineToks| |$r|)) - ((CHAR= (SCHAR (|lexerInputLine| |lex|) 0) (|char| '|)|)) + ((CHAR= (SCHAR (|lexerLineString| |lex|) 0) (|char| '|)|)) (COND - ((SETQ |command| (|shoeLine?| (|lexerInputLine| |lex|))) + ((SETQ |command| (|shoeLine?| (|lexerLineString| |lex|))) (SETQ |dq| (|dqUnit| (|makeToken| |$linepos| (|shoeLeafLine| |command|) 0))) (CONS (LIST |dq|) |$r|)) - ((SETQ |command| (|shoeLisp?| (|lexerInputLine| |lex|))) + ((SETQ |command| (|shoeLisp?| (|lexerLineString| |lex|))) (|shoeLispToken| |lex| |$r| |command|)) (T (|shoeLineToks| |$r|)))) (T (SETQ |toks| NIL) @@ -96,7 +96,7 @@ (COND ((OR (EQL (LENGTH |string|) 0) (CHAR= (SCHAR |string| 0) (|char| '|;|))) (SETQ |string| ""))) - (SETQ |ln| (|lexerInputLine| |lex|)) + (SETQ |ln| (|lexerLineString| |lex|)) (SETQ |linepos| |$linepos|) (SETQ |LETTMP#1| (|shoeAccumulateLines| |lex| |s| |string|)) (SETQ |r| (CAR |LETTMP#1|)) @@ -109,10 +109,10 @@ (DECLARE (SPECIAL |$r| |$n|)) (COND ((NOT (|shoeNextLine| |lex| |s|)) (CONS |s| |string|)) ((NULL |$n|) (|shoeAccumulateLines| |lex| |$r| |string|)) - ((EQL (LENGTH (|lexerInputLine| |lex|)) 0) + ((EQL (LENGTH (|lexerLineString| |lex|)) 0) (|shoeAccumulateLines| |lex| |$r| |string|)) - ((CHAR= (SCHAR (|lexerInputLine| |lex|) 0) (|char| '|)|)) - (SETQ |command| (|shoeLisp?| (|lexerInputLine| |lex|))) + ((CHAR= (SCHAR (|lexerLineString| |lex|) 0) (|char| '|)|)) + (SETQ |command| (|shoeLisp?| (|lexerLineString| |lex|))) (COND ((AND |command| (PLUSP (LENGTH |command|))) (COND @@ -138,7 +138,7 @@ (PROGN (SETQ |linepos| |$linepos|) (SETQ |n| |$n|) - (SETQ |ch| (SCHAR (|lexerInputLine| |lex|) |$n|)) + (SETQ |ch| (SCHAR (|lexerLineString| |lex|) |$n|)) (SETQ |b| (COND ((|shoeStartsComment| |lex|) (|shoeComment| |lex|) NIL) ((|shoeStartsNegComment| |lex|) (|shoeNegComment| |lex|) @@ -191,12 +191,12 @@ (COND ((NOT (< |$n| |$sz|)) (|SoftShoeError| (CONS |$linepos| |$n|) "lisp escape error") - (|shoeLeafError| (SCHAR (|lexerInputLine| |lex|) |$n|))) - (T (SETQ |a| (|shoeReadLispString| (|lexerInputLine| |lex|) |$n|)) + (|shoeLeafError| (SCHAR (|lexerLineString| |lex|) |$n|))) + (T (SETQ |a| (|shoeReadLispString| (|lexerLineString| |lex|) |$n|)) (COND ((NULL |a|) (|SoftShoeError| (CONS |$linepos| |$n|) "lisp escape error") - (|shoeLeafError| (SCHAR (|lexerInputLine| |lex|) |$n|))) + (|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|)))))))))) @@ -217,7 +217,7 @@ (LOOP (COND (|$n| (RETURN NIL)) (T (|shoeNextLine| |lex| |$r|)))) (|shoeEsc| |lex|) NIL) (T NIL))) - (T (SETQ |n1| (|firstNonblankPosition| (|lexerInputLine| |lex|) |$n|)) + (T (SETQ |n1| (|firstNonblankPosition| (|lexerLineString| |lex|) |$n|)) (COND ((NULL |n1|) (|shoeNextLine| |lex| |$r|) (LOOP (COND (|$n| (RETURN NIL)) (T (|shoeNextLine| |lex| |$r|)))) @@ -230,10 +230,10 @@ (COND ((< |$n| |$sz|) (COND - ((CHAR= (SCHAR (|lexerInputLine| |lex|) |$n|) (|char| '+)) + ((CHAR= (SCHAR (|lexerLineString| |lex|) |$n|) (|char| '+)) (SETQ |www| (+ |$n| 1)) (COND ((NOT (< |www| |$sz|)) NIL) - (T (CHAR= (SCHAR (|lexerInputLine| |lex|) |www|) (|char| '+))))) + (T (CHAR= (SCHAR (|lexerLineString| |lex|) |www|) (|char| '+))))) (T NIL))) (T NIL)))) @@ -243,10 +243,10 @@ (COND ((< |$n| |$sz|) (COND - ((CHAR= (SCHAR (|lexerInputLine| |lex|) |$n|) (|char| '-)) + ((CHAR= (SCHAR (|lexerLineString| |lex|) |$n|) (|char| '-)) (SETQ |www| (+ |$n| 1)) (COND ((NOT (< |www| |$sz|)) NIL) - (T (CHAR= (SCHAR (|lexerInputLine| |lex|) |www|) (|char| '-))))) + (T (CHAR= (SCHAR (|lexerLineString| |lex|) |www|) (|char| '-))))) (T NIL))) (T NIL)))) @@ -256,7 +256,7 @@ (PROGN (SETQ |n| |$n|) (SETQ |$n| |$sz|) - (|shoeLeafNegComment| (|subString| (|lexerInputLine| |lex|) |n|))))) + (|shoeLeafNegComment| (|subString| (|lexerLineString| |lex|) |n|))))) (DEFUN |shoeComment| (|lex|) (LET* (|n|) @@ -264,13 +264,13 @@ (PROGN (SETQ |n| |$n|) (SETQ |$n| |$sz|) - (|shoeLeafComment| (|subString| (|lexerInputLine| |lex|) |n|))))) + (|shoeLeafComment| (|subString| (|lexerLineString| |lex|) |n|))))) (DEFUN |shoePunct| (|lex|) (LET* (|sss|) (DECLARE (SPECIAL |$n|)) (PROGN - (SETQ |sss| (|shoeMatch| (|lexerInputLine| |lex|) |$n|)) + (SETQ |sss| (|shoeMatch| (|lexerLineString| |lex|) |$n|)) (SETQ |$n| (+ |$n| (LENGTH |sss|))) (|shoeKeyTr| |lex| |sss|)))) @@ -285,7 +285,7 @@ (DECLARE (SPECIAL |$sz| |$n|)) (COND ((OR (NOT (< |$n| |$sz|)) - (NOT (DIGIT-CHAR-P (SCHAR (|lexerInputLine| |lex|) |$n|)))) + (NOT (DIGIT-CHAR-P (SCHAR (|lexerLineString| |lex|) |$n|)))) (|shoeLeafKey| |w|)) (T (SETQ |w| (|shoeInteger| |lex|)) (|shoeExponent| |lex| "0" |w|)))) @@ -294,11 +294,11 @@ (DECLARE (SPECIAL |$floatok| |$n|)) (PROGN (SETQ |n| |$n|) - (SETQ |$n| (|firstNonblankPosition| (|lexerInputLine| |lex|) |$n|)) + (SETQ |$n| (|firstNonblankPosition| (|lexerLineString| |lex|) |$n|)) (SETQ |$floatok| T) (COND ((NULL |$n|) (|shoeLeafSpaces| 0) - (SETQ |$n| (LENGTH (|lexerInputLine| |lex|)))) + (SETQ |$n| (LENGTH (|lexerLineString| |lex|)))) (T (|shoeLeafSpaces| (- |$n| |n|))))))) (DEFUN |shoeString| (|lex|) @@ -316,19 +316,19 @@ (|SoftShoeError| (CONS |$linepos| |$n|) "quote added") "") (T (SETQ |n| |$n|) (SETQ |strsym| - (OR (|charPosition| (|char| '|"|) (|lexerInputLine| |lex|) |$n|) + (OR (|charPosition| (|char| '|"|) (|lexerLineString| |lex|) |$n|) |$sz|)) (SETQ |escsym| - (OR (|charPosition| (|char| '_) (|lexerInputLine| |lex|) |$n|) + (OR (|charPosition| (|char| '_) (|lexerLineString| |lex|) |$n|) |$sz|)) (SETQ |mn| (MIN |strsym| |escsym|)) (COND ((EQUAL |mn| |$sz|) (SETQ |$n| |$sz|) (|SoftShoeError| (CONS |$linepos| |$n|) "quote added") - (|subString| (|lexerInputLine| |lex|) |n|)) + (|subString| (|lexerLineString| |lex|) |n|)) ((EQUAL |mn| |strsym|) (SETQ |$n| (+ |mn| 1)) - (|subString| (|lexerInputLine| |lex|) |n| (- |mn| |n|))) - (T (SETQ |str| (|subString| (|lexerInputLine| |lex|) |n| (- |mn| |n|))) + (|subString| (|lexerLineString| |lex|) |n| (- |mn| |n|))) + (T (SETQ |str| (|subString| (|lexerLineString| |lex|) |n| (- |mn| |n|))) (SETQ |$n| (+ |mn| 1)) (SETQ |a| (|shoeEsc| |lex|)) (SETQ |b| (COND @@ -336,7 +336,7 @@ (SETQ |str| (CONCAT |str| (STRING - (SCHAR (|lexerInputLine| |lex|) |$n|)))) + (SCHAR (|lexerLineString| |lex|) |$n|)))) (SETQ |$n| (+ |$n| 1)) (|shoeS| |lex|)) (T (|shoeS| |lex|)))) (CONCAT |str| |b|))))))) @@ -357,15 +357,16 @@ (SETQ |n1| |$n|) (SETQ |$n| (+ |$n| 1)) (SETQ |l| |$sz|) - (SETQ |endid| (|shoeIdEnd| (|lexerInputLine| |lex|) |$n|)) + (SETQ |endid| (|shoeIdEnd| (|lexerLineString| |lex|) |$n|)) (COND ((OR (EQUAL |endid| |l|) - (NOT (CHAR= (SCHAR (|lexerInputLine| |lex|) |endid|) (|char| '_)))) + (NOT (CHAR= (SCHAR (|lexerLineString| |lex|) |endid|) (|char| '_)))) (SETQ |$n| |endid|) - (LIST |b| (|subString| (|lexerInputLine| |lex|) |n1| (- |endid| |n1|)))) + (LIST |b| + (|subString| (|lexerLineString| |lex|) |n1| (- |endid| |n1|)))) (T (SETQ |str| - (|subString| (|lexerInputLine| |lex|) |n1| (- |endid| |n1|))) + (|subString| (|lexerLineString| |lex|) |n1| (- |endid| |n1|))) (SETQ |$n| (+ |endid| 1)) (SETQ |a| (|shoeEsc| |lex|)) (SETQ |bb| (COND (|a| (|shoeW| |lex| T)) (T (LIST |b| "")))) (LIST (OR (ELT |bb| 0) |b|) (CONCAT |str| (ELT |bb| 1)))))))) @@ -393,15 +394,15 @@ (COND ((NOT (AND (< |$n| |l|) - (DIGIT-CHAR-P (SCHAR (|lexerInputLine| |lex|) |$n|)))) + (DIGIT-CHAR-P (SCHAR (|lexerLineString| |lex|) |$n|)))) (RETURN NIL)) (T (SETQ |$n| (+ |$n| 1))))) (COND ((OR (EQUAL |$n| |l|) - (NOT (CHAR= (SCHAR (|lexerInputLine| |lex|) |$n|) (|char| '_)))) + (NOT (CHAR= (SCHAR (|lexerLineString| |lex|) |$n|) (|char| '_)))) (COND ((AND (EQUAL |n| |$n|) |zro|) "0") - (T (|subString| (|lexerInputLine| |lex|) |n| (- |$n| |n|))))) - (T (SETQ |str| (|subString| (|lexerInputLine| |lex|) |n| (- |$n| |n|))) + (T (|subString| (|lexerLineString| |lex|) |n| (- |$n| |n|))))) + (T (SETQ |str| (|subString| (|lexerLineString| |lex|) |n| (- |$n| |n|))) (SETQ |$n| (+ |$n| 1)) (SETQ |a| (|shoeEsc| |lex|)) (SETQ |bb| (|shoeInteger1| |lex| |zro|)) (CONCAT |str| |bb|)))))) @@ -425,11 +426,12 @@ (SETQ |a| (|shoeInteger| |lex|)) (COND ((NOT (< |$n| |$sz|)) (|shoeLeafInteger| |a|)) ((AND |$floatok| - (CHAR= (SCHAR (|lexerInputLine| |lex|) |$n|) (|char| '|.|))) + (CHAR= (SCHAR (|lexerLineString| |lex|) |$n|) (|char| '|.|))) (SETQ |n| |$n|) (SETQ |$n| (+ |$n| 1)) (COND ((AND (< |$n| |$sz|) - (CHAR= (SCHAR (|lexerInputLine| |lex|) |$n|) (|char| '|.|))) + (CHAR= (SCHAR (|lexerLineString| |lex|) |$n|) + (|char| '|.|))) (SETQ |$n| |n|) (|shoeLeafInteger| |a|)) (T (SETQ |w| (|shoeInteger1| |lex| T)) (|shoeExponent| |lex| |a| |w|)))) @@ -439,24 +441,24 @@ (LET* (|c1| |e| |c| |n|) (DECLARE (SPECIAL |$sz| |$n|)) (COND ((NOT (< |$n| |$sz|)) (|shoeLeafFloat| |a| |w| 0)) - (T (SETQ |n| |$n|) (SETQ |c| (SCHAR (|lexerInputLine| |lex|) |$n|)) + (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 (|lexerInputLine| |lex|) |$n|)) + ((DIGIT-CHAR-P (SCHAR (|lexerLineString| |lex|) |$n|)) (SETQ |e| (|shoeInteger| |lex|)) (SETQ |e| (|shoeIntValue| |e|)) (|shoeLeafFloat| |a| |w| |e|)) - (T (SETQ |c1| (SCHAR (|lexerInputLine| |lex|) |$n|)) + (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 (|lexerInputLine| |lex|) |$n|)) + ((DIGIT-CHAR-P (SCHAR (|lexerLineString| |lex|) |$n|)) (SETQ |e| (|shoeInteger| |lex|)) (SETQ |e| (|shoeIntValue| |e|)) (|shoeLeafFloat| |a| |w| @@ -475,9 +477,9 @@ (CONCAT "The character whose number is " (WRITE-TO-STRING (CHAR-CODE - (SCHAR (|lexerInputLine| |lex|) |n|))) + (SCHAR (|lexerLineString| |lex|) |n|))) " is not a Boot character")) - (|shoeLeafError| (SCHAR (|lexerInputLine| |lex|) |n|))))) + (|shoeLeafError| (SCHAR (|lexerLineString| |lex|) |n|))))) (DEFUN |shoeKeyWord| (|st|) (|tableValue| |shoeKeyTable| |st|)) -- cgit v1.2.3