diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-10-01 14:02:30 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-10-01 14:02:30 +0000 |
| commit | 73374b314b15f2a313718d0e347a1050d1d1a405 (patch) | |
| tree | e893bb8f428e229c04445ffc11fdc0a2f3f6a1f5 /src/boot/tokens.boot | |
| parent | 4cb6f558586ccd4893c2acd088bba66654f6bf19 (diff) | |
| download | open-axiom-73374b314b15f2a313718d0e347a1050d1d1a405.tar.gz | |
* boot/utility.boot: Define BOOTTRAN namespace.
(setUnion): New.
(setDifference): New.
* boot/translator.boot (packageBody): New.
(translateToplevel): Use it. Translate namespace definition.
* boot/tokens.boot: Replace bitmask with bitref.
Do not translate setDifference and setUnion.
* boot/parser.boot (bpDef): Now include namespace definition.
(bpComma): Remove namespace rule as subsumed by Where rule.
* boot/Makefile.in: Remove dependencies on initial-env.lisp.
(AXIOM_LOCAL_LISP_sources): Remove as unused,
(boot_sources): Remove as redundant with boot_SOURCES.
* boot/initial-env.lisp: Remove.
Diffstat (limited to 'src/boot/tokens.boot')
| -rw-r--r-- | src/boot/tokens.boot | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot index e39cee89..2bacc64c 100644 --- a/src/boot/tokens.boot +++ b/src/boot/tokens.boot @@ -166,10 +166,10 @@ shoeDict:=shoeDictCons() shoePunCons()== a := makeBitVector 256 for i in 0..255 repeat - bitmask(a,i) := 0 + bitref(a,i) := 0 for [k,:.] in entries shoeKeyTable repeat shoeStartsId stringChar(k,0) => nil - bitmask(a,codePoint stringChar(k,0)) := 1 + bitref(a,codePoint stringChar(k,0)) := 1 a shoePun:=shoePunCons() @@ -224,7 +224,7 @@ for i in [ _ ["append", nil] , _ ["append!", nil] , _ ["UNION", nil] , _ - ["UNIONQ", nil] , _ + ["setUnion", nil] , _ ["union", nil] , _ ["and", true] , _ ["or", false] , _ @@ -244,7 +244,7 @@ for i in [ _ ["array?", "ARRAYP"] , _ ["arrayRef", "AREF"] , _ ["atom", "ATOM"] , _ - ["bitmask", "SBIT"] , _ + ["bitref", "SBIT"] , _ ["canonicalFilename", "PROBE-FILE"], _ ["charByName", "NAME-CHAR"] , _ ["charDowncase", "CHAR-DOWNCASE"], _ @@ -297,9 +297,7 @@ for i in [ _ ["scalarEq?", "EQL" ] , _ ["scalarEqual?","EQL" ] , _ ["second", "CADR"] , _ - ["setIntersection", "INTERSECTION"] , _ ["setPart", "SETELT"] , _ - ["setUnion", "UNION"] , _ ["strconc", "CONCAT"] , _ ["stringChar", "SCHAR"] , _ ["stringDowncase", "STRING-DOWNCASE"] , _ |