diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-06-16 03:05:07 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-06-16 03:05:07 +0000 |
| commit | a47287421322670f8de068fdfa06c1e68844f2e0 (patch) | |
| tree | 2011370b8161ecbc80b044e9877c68f052858fb6 /src | |
| parent | 3853f26115f242232720abb5252978de20b72c01 (diff) | |
| download | open-axiom-a47287421322670f8de068fdfa06c1e68844f2e0.tar.gz | |
Fix SF/2396945
* interp/scan.boot: '@@' is no longer a keyword.
* interp/cparse.boot (npColonQuery): Remove.
* interp/parse.boot (parseAtAt): Likewise.
* interp/postpar.boot (postAtAt): Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/interp/cparse.boot | 4 | ||||
| -rw-r--r-- | src/interp/parse.boot | 6 | ||||
| -rw-r--r-- | src/interp/postpar.boot | 6 | ||||
| -rw-r--r-- | src/interp/scan.boot | 1 |
5 files changed, 9 insertions, 16 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6771ef28..b8c6c80d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,13 @@ 2009-06-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + Fix SF/2396945 + * interp/scan.boot: '@@' is no longer a keyword. + * interp/cparse.boot (npColonQuery): Remove. + * interp/parse.boot (parseAtAt): Likewise. + * interp/postpar.boot (postAtAt): Likewise. + +2009-06-15 Gabriel Dos Reis <gdr@cs.tamu.edu> + Fix SF/2806053 * lisp/Makefile.in: Remove generated files when cleaning. * interp/Makefile.pamphlet: Add executable extensions if appropriate. diff --git a/src/interp/cparse.boot b/src/interp/cparse.boot index 552862ae..074d3510 100644 --- a/src/interp/cparse.boot +++ b/src/interp/cparse.boot @@ -464,12 +464,10 @@ npRestrict() == npTypedForm("AT",function pfRestrict) npCoerceTo() == npTypedForm("COERCE",function pfCoerceto) -npColonQuery() == npTypedForm("ATAT",function pfRetractTo) - npPretend() == npTypedForm("PRETEND",function pfPretend) npTypeStyle()== - npCoerceTo() or npRestrict() or npPretend() or npColonQuery() + npCoerceTo() or npRestrict() or npPretend() npTypified ()==npApplication() and npAnyNo function npTypeStyle diff --git a/src/interp/parse.boot b/src/interp/parse.boot index 1886e924..2a93222d 100644 --- a/src/interp/parse.boot +++ b/src/interp/parse.boot @@ -197,11 +197,6 @@ parsePretend t == t isnt ["pretend",x,typ] => systemErrorHere ["parsePretend",t] ["pretend",parseTran x,parseType typ] -parseAtAt: %ParseForm -> %Form -parseAtAt t == - t isnt ["@@",x,typ] => systemErrorHere ["parseAtAt",t] - ["@@",parseTran x,parseType typ] - parseHas: %ParseForm -> %Form parseHas t == t isnt ["has",x,y] => systemErrorHere ["parseHas",t] @@ -482,7 +477,6 @@ for x in [["<=", :"parseLessEqual"],_ ["MDEF", :"parseMDEF"],_ ["or", :"parseOr"],_ ["pretend", :"parsePretend"],_ - ["@@",:"parseAtAt"],_ ["SEGMENT", :"parseSegment"],_ ["SEQ", :"parseSeq"],_ ["VCONS", :"parseVCONS"],_ diff --git a/src/interp/postpar.boot b/src/interp/postpar.boot index af5ec656..dfd5da03 100644 --- a/src/interp/postpar.boot +++ b/src/interp/postpar.boot @@ -143,11 +143,6 @@ postPretend t == t isnt ["pretend",x,y] => systemErrorHere ["postPretend",t] ["pretend",postTran x,:postType y] -postAtAt: %ParseTree -> %ParseForm -postAtAt t == - t isnt ["@@",x,y] => systemErrorHere ["postAtAt",t] - ["@@",postTran x,:postType y] - postConstruct: %ParseTree -> %ParseForm postConstruct u == u is ["construct",b] => @@ -625,7 +620,6 @@ for x in [["with", :"postWith"],_ [":", :"postColon"],_ ["@", :"postAtSign"],_ ["pretend", :"postPretend"],_ - ["@@",:"postAtAt"],_ ["if", :"postIf"],_ ["Join", :"postJoin"],_ ["%Signature", :"postSignature"],_ diff --git a/src/interp/scan.boot b/src/interp/scan.boot index 77f5bdc4..a5fc4135 100644 --- a/src/interp/scan.boot +++ b/src/interp/scan.boot @@ -110,7 +110,6 @@ scanKeyWords == [ _ ['":","COLON" ],_ ['":-","COLONDASH" ],_ ['"@","AT" ],_ - ['"@@","ATAT" ],_ ['",","COMMA" ],_ ['";","SEMICOLON" ],_ ['"**","POWER" ],_ |