diff options
author | dos-reis <gdr@axiomatics.org> | 2010-12-28 20:51:13 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2010-12-28 20:51:13 +0000 |
commit | 77f815abfd7c7d429b6bba09f249ae195ec04898 (patch) | |
tree | 4d61a52ac0610a9e2ac0d2d94a155799dab0f6bd /src/boot/parser.boot | |
parent | 8efa78fb1bfa0e9afce20922020129130f9c69be (diff) | |
download | open-axiom-77f815abfd7c7d429b6bba09f249ae195ec04898.tar.gz |
more cleanup
Diffstat (limited to 'src/boot/parser.boot')
-rw-r--r-- | src/boot/parser.boot | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/src/boot/parser.boot b/src/boot/parser.boot index 14cbd4a0..ff0d0cc4 100644 --- a/src/boot/parser.boot +++ b/src/boot/parser.boot @@ -372,17 +372,17 @@ bpName() == ++ QUOTE S-Expression ++ STRING bpConstTok() == - shoeTokType $stok in '(INTEGER FLOAT) => - bpPush $ttok - bpNext() - $stok is ["LISP",:.] => bpPush %Lisp $ttok and bpNext() - $stok is ["LISPEXP",:.] => bpPush $ttok and bpNext() - $stok is ["LINE",:.] => bpPush ["+LINE", $ttok] and bpNext() - bpEqPeek "QUOTE" => - bpNext() - (bpSexp() or bpTrap()) and - bpPush bfSymbol bpPop1() - bpString() + shoeTokType $stok in '(INTEGER FLOAT) => + bpPush $ttok + bpNext() + $stok is ["LISP",:.] => bpPush %Lisp $ttok and bpNext() + $stok is ["LISPEXP",:.] => bpPush $ttok and bpNext() + $stok is ["LINE",:.] => bpPush ["+LINE", $ttok] and bpNext() + bpEqPeek "QUOTE" => + bpNext() + (bpSexp() or bpTrap()) and + bpPush bfSymbol bpPop1() + bpString() ++ Subroutine of bpExportItem. Parses tails of ExportItem. @@ -515,18 +515,18 @@ bpAddTokens n== [shoeTokConstruct("KEY","BACKTAB",shoeTokPosn $stok),:bpAddTokens(n+1)] bpExceptions()== - bpEqPeek "DOT" or bpEqPeek "QUOTE" or - bpEqPeek "OPAREN" or bpEqPeek "CPAREN" or - bpEqPeek "SETTAB" or bpEqPeek "BACKTAB" - or bpEqPeek "BACKSET" + bpEqPeek "DOT" or bpEqPeek "QUOTE" or + bpEqPeek "OPAREN" or bpEqPeek "CPAREN" or + bpEqPeek "SETTAB" or bpEqPeek "BACKTAB" + or bpEqPeek "BACKSET" bpSexpKey()== - $stok is ["KEY",:.] and not bpExceptions()=> - a := $ttok has SHOEINF - a = nil => bpPush $ttok and bpNext() - bpPush a and bpNext() - false + $stok is ["KEY",:.] and not bpExceptions()=> + a := $ttok has SHOEINF + a = nil => bpPush $ttok and bpNext() + bpPush a and bpNext() + false bpAnyId()== bpEqKey "MINUS" and ($stok is ["INTEGER",:.] or bpTrap()) and @@ -597,9 +597,9 @@ bpTyping() == ++ Tagged: ++ Name : Typing bpTagged()== - bpApplication() and - (bpEqKey "COLON" and (bpTyping() or bpTrap()) and - bpPush bfTagged(bpPop2(),bpPop1()) or true) + bpApplication() and + (bpEqKey "COLON" and (bpTyping() or bpTrap()) and + bpPush bfTagged(bpPop2(),bpPop1()) or true) bpExpt()== bpRightAssoc('(POWER),function bpTagged) @@ -754,9 +754,9 @@ bpReturn()== bpLogical()== bpLeftAssoc('(OR),function bpReturn) bpExpression()== - bpEqKey "COLON" and (bpLogical() and - bpPush bfApplication ("COLON",bpPop1()) - or bpTrap()) or bpLogical() + bpEqKey "COLON" and (bpLogical() and + bpPush bfApplication ("COLON",bpPop1()) + or bpTrap()) or bpLogical() bpStatement()== bpConditional function bpWhere or bpLoop() @@ -764,13 +764,13 @@ bpStatement()== or bpTry() bpLoop()== - bpIterators() and - (bpCompMissing "REPEAT" and - (bpWhere() or bpTrap()) and - bpPush bfLp(bpPop2(),bpPop1())) - or - bpEqKey "REPEAT" and (bpLogical() or bpTrap()) and - bpPush bfLoop1 bpPop1 () + bpIterators() and + (bpCompMissing "REPEAT" and + (bpWhere() or bpTrap()) and + bpPush bfLp(bpPop2(),bpPop1())) + or + bpEqKey "REPEAT" and (bpLogical() or bpTrap()) and + bpPush bfLoop1 bpPop1 () bpSuchThat()==bpAndOr("BAR",function bpWhere,function bfSuchthat) @@ -841,16 +841,16 @@ bpExit()== bpDefinition()== a:=bpState() bpExit() => - bpEqPeek "DEF" => - bpRestore a - bpDef() - bpEqPeek "TDEF" => - bpRestore a - bpTypeAliasDefition() - bpEqPeek "MDEF" => - bpRestore a - bpMdef() - true + bpEqPeek "DEF" => + bpRestore a + bpDef() + bpEqPeek "TDEF" => + bpRestore a + bpTypeAliasDefition() + bpEqPeek "MDEF" => + bpRestore a + bpMdef() + true bpRestore a false |