From 0918966a29424a0e4cb9738d9f6fb5ae085f186c Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Sun, 20 Mar 2011 04:04:14 +0000
Subject: 	* boot/translator.boot (FC): Remove. 	(FBO): Likewise. 
 (FEV): Likewise. 	(shoeGeneralFC): Likewise. 	(shoeFindName):
 Likewise. 	(shoeFindName2): Likewise. 	(shoeTransform2): Likewise. 
 * boot/scanner.boot (shoeLineToks): Don't support `)package' line 
 anymore. 	* boot/includer.boot: Remove support for `)package',
 `)include', 	`)includelisp', `)includelines' lines. 	(shorPackageStartsAt):
 Remove. 	(shorFindLines): Likewise. 	(shoeFileInput): Likewise. 
 (shoeLispFileInput): Likewise. 	(shoeLineFileInput): Likewise. 
 (shoeFunctionFileInput): Likewise. 	(shoePlainLine?): Reflect removal. 
 (shoeSimpleLine): Likewise. 	* boot/tokens.boot (charByName): New builtin
 library function. 	* algebra/sf.spad.pamphlet (RealNumberSystem): Don't
 re-export 	abs.  It is already exported by OrderedRing.

---
 src/interp/scan.boot | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'src/interp')

diff --git a/src/interp/scan.boot b/src/interp/scan.boot
index e3110d2f..a1a25fb1 100644
--- a/src/interp/scan.boot
+++ b/src/interp/scan.boot
@@ -279,7 +279,7 @@ lineoftoks(s)==
     [[[b,s]],:$r]
   while $n<$sz repeat
     toks := dqAppend(toks,scanToken())
-  null toks => [[],:$r]
+  null toks => [nil,:$r]
   [[[toks,s]],:$r]
 
 
@@ -312,7 +312,6 @@ scanToken() ==
 
 -- to pair badge and badgee
 
--- lfid x== ["id",makeSymbol x]
 lfid x ==
   ["id",makeSymbol(x, '"BOOT")]
 
@@ -320,12 +319,7 @@ lfkey x ==
   ["key",keyword x]
 
 lfinteger x==
-           ["integer",x]
---     if x = '"0"
---     then ["id",makeSymbol x]
---     else if x = '"1"
---          then ["id",makeSymbol x]
---          else ["integer",x]
+  ["integer",x]
 
 lfrinteger (r,x)==
   ["integer",strconc (r,strconc('"r",x))]
@@ -352,15 +346,14 @@ lfspaces x ==
   ["spaces",x]
 
 constoken(ln,lp,b,n)==
---  [b.0,b.1,[lp,:n]]
   a := [b.0,:b.1]
   ncPutQ(a,"posn",[lp,:n])
   a
 
 scanEscape()==
   $n := $n+1
-  a := scanEsc()
-  if a then scanWord true else nil
+  scanEsc() => scanWord true
+  nil
 
 scanEsc()==
   $n >= $sz =>
@@ -379,7 +372,7 @@ scanEsc()==
     false
   $n = n1 => true
   stringChar($ln,n1) = char "__" =>
-    $n:=n1+1
+    $n := n1+1
     scanEsc()
     false
   $n := n1
@@ -432,7 +425,7 @@ scanKeyTr w==
   lfkey w
 
 scanPossFloat (w)==
-  $n>=$sz or not digit? $ln.$n => lfkey w
+  $n >= $sz or not digit? $ln.$n => lfkey w
   w := spleI(function digit?)
   scanExponent('"0",w)
 
-- 
cgit v1.2.3