diff options
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/boot/tokens.boot | 3 | ||||
| -rw-r--r-- | src/interp/msg.boot | 2 | ||||
| -rw-r--r-- | src/interp/newfort.boot | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 931cd612..59ae56a5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2010-05-09 Gabriel Dos Reis <gdr@cs.tamu.edu> + * boot/tokens.boot: Don't rename 'car', 'cdr', and PAIRP. + +2010-05-09 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/bc-solve.boot: Move cleanups. * interp/br-con.boot: Likewise. * interp/br-op1.boot: Likewise. diff --git a/src/boot/tokens.boot b/src/boot/tokens.boot index d40e7f80..8f627aac 100644 --- a/src/boot/tokens.boot +++ b/src/boot/tokens.boot @@ -237,8 +237,6 @@ for i in [ _ ["append", "APPEND"] , _ ["apply", "APPLY"] , _ ["atom", "ATOM"] , _ - ["car", "CAR"] , _ - ["cdr", "CDR"] , _ ["cons?", "CONSP"] , _ ["copy", "COPY"] , _ ["croak", "CROAK"] , _ @@ -261,7 +259,6 @@ for i in [ _ ["null", "NULL"] , _ ["or", "OR"] , _ ["otherwise", "T"] , _ - ["PAIRP", "CONSP"] , _ ["removeDuplicates", "REMDUP"] , _ ["rest", "CDR"] , _ ["reverse", "REVERSE"] , _ diff --git a/src/interp/msg.boot b/src/interp/msg.boot index 8d59e963..455b3248 100644 --- a/src/interp/msg.boot +++ b/src/interp/msg.boot @@ -105,7 +105,7 @@ msgCreate(tag,posWTag,key,argL,optPre,:optAttr) == if cons? key then tag := 'old msg := [tag,posWTag,key,argL,optPre,NIL] if first optAttr then - setMsgForcedAttrList(msg,car optAttr) + setMsgForcedAttrList(msg,first optAttr) putDatabaseStuff msg initImPr msg initToWhere msg diff --git a/src/interp/newfort.boot b/src/interp/newfort.boot index ccd1de1d..03e3695c 100644 --- a/src/interp/newfort.boot +++ b/src/interp/newfort.boot @@ -716,7 +716,7 @@ fortFormatCharacterTypes(names) == #u=2 => sortedByLength := insertEntry(second u,first u,sortedByLength) genuineArrays := [u,:genuineArrays] for u in sortedByLength repeat - fortFormatTypes1(mkCharName car u, [STRINGIMAGE(s) for s in rest(u)]) where + fortFormatTypes1(mkCharName first u, [STRINGIMAGE(s) for s in rest(u)]) where mkCharName v == strconc("CHARACTER*(",STRINGIMAGE v,")") if (not null genuineArrays) then fortFormatTypes1('"CHARACTER",mkParameterList2 genuineArrays) where |