From a47287421322670f8de068fdfa06c1e68844f2e0 Mon Sep 17 00:00:00 2001
From: dos-reis <gdr@axiomatics.org>
Date: Tue, 16 Jun 2009 03:05:07 +0000
Subject: 	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.

---
 src/ChangeLog           | 8 ++++++++
 src/interp/cparse.boot  | 4 +---
 src/interp/parse.boot   | 6 ------
 src/interp/postpar.boot | 6 ------
 src/interp/scan.boot    | 1 -
 5 files changed, 9 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/ChangeLog b/src/ChangeLog
index 6771ef28..b8c6c80d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+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
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" ],_
-- 
cgit v1.2.3