diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-09-26 13:49:18 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-09-26 13:49:18 +0000 |
| commit | 91bd7571dc0baf8d17047d553e4616dd587c0ffb (patch) | |
| tree | 2e2a2eb23ff2cb76b6eb3ae763a480ac1f0078ad /src/interp/incl.boot | |
| parent | 868f1d56a5bcd7d712855e98085e0e15d32a3264 (diff) | |
| download | open-axiom-91bd7571dc0baf8d17047d553e4616dd587c0ffb.tar.gz | |
* interp/: More cleanup.
Diffstat (limited to 'src/interp/incl.boot')
| -rw-r--r-- | src/interp/incl.boot | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/interp/incl.boot b/src/interp/incl.boot index 016a2fa5..c09ddcfe 100644 --- a/src/interp/incl.boot +++ b/src/interp/incl.boot @@ -78,7 +78,7 @@ incLine(eb, str, gno, lno, ufo) == ln := lnCreate(eb,str,gno,lno,ufo) CONS(CONS(ln,1), str) -incPos f == CAR f +incPos f == first f incRenumberItem(f, i) == l := CAAR f @@ -174,7 +174,7 @@ incActive?(fn,ufos)==member(fn,ufos) incNConsoles ufos== a:=member('"console",ufos) - if a then 1+incNConsoles CDR a else 0 + if a then 1+incNConsoles rest a else 0 --% Message Handling incHandleMessage(xl) == @@ -267,7 +267,7 @@ xlIfSyntax(eb, str, lno,ufos,info,sts) == incLude(eb, ss, ln, ufos, states) == Delay(function incLude1,[eb, ss, ln, ufos, states]) -Rest s==>incLude (eb,CDR ss,lno,ufos,states) +Rest s==>incLude (eb,rest ss,lno,ufos,states) incLude1 (:z) == [eb, ss, ln, ufos, states]:=z @@ -281,7 +281,7 @@ incLude1 (:z) == '")--premature end", lno,ufos), StreamNil) StreamNil - str := EXPAND_-TABS CAR ss + str := EXPAND_-TABS first ss info := incClassify str not info.0 => @@ -350,7 +350,7 @@ incLude1 (:z) == Skipping? state => IfSkipToEnd if ifCond(str,info) then IfKeepPart else IfSkipPart cons(xlOK(eb,str,lno,ufos.0), - incLude(eb,CDR ss,lno,ufos,cons(s1,states))) + incLude(eb,rest ss,lno,ufos,cons(s1,states))) info.2 = '"elseif" => not If? state and not Elseif? state => cons(xlIfSyntax(eb, str,lno,ufos,info,states), @@ -366,7 +366,7 @@ incLude1 (:z) == else ElseifSkipPart else ElseifSkipToEnd cons(xlOK(eb,str,lno,ufos.0), - incLude(eb,CDR ss,lno,ufos,cons(s1,rest states))) + incLude(eb,rest ss,lno,ufos,cons(s1,rest states))) else cons(xlIfBug(eb, str, lno,ufos), StreamNil) @@ -380,7 +380,7 @@ incLude1 (:z) == then ElseKeepPart else ElseSkipToEnd cons(xlOK(eb,str,lno,ufos.0), - incLude(eb,CDR ss,lno,ufos,cons(s1,rest states))) + incLude(eb,rest ss,lno,ufos,cons(s1,rest states))) else cons(xlIfBug(eb, str, lno,ufos), StreamNil) @@ -389,7 +389,7 @@ incLude1 (:z) == cons(xlIfSyntax(eb, str,lno,ufos,info,states), StreamNil) cons(xlOK(eb,str,lno,ufos.0), - incLude(eb,CDR ss,lno,ufos,rest states)) + incLude(eb,rest ss,lno,ufos,rest states)) info.2 = '"magicNumber" => Rest s |