diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-08-17 13:34:29 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-08-17 13:34:29 +0000 |
| commit | cd78da3860f838c41aedc3a0c475cfc8c23eaad3 (patch) | |
| tree | d5ff533c51c40fcfec604902bfc78c83db950a7b /src/interp/pspad1.boot | |
| parent | f20eeee3e9937d7696cc06841f6c411a0022963e (diff) | |
| download | open-axiom-cd78da3860f838c41aedc3a0c475cfc8c23eaad3.tar.gz | |
* boot/tokens.boot: Retire "^" as negation operator.
* interp/br-search.boot: Use "not" instead of "^".
* interp/br-util.boot: Likewise.
* interp/database.boot: Likewise.
* interp/define.boot: Likewise.
* interp/format.boot: Likewise.
* interp/g-error.boot: Likewise.
* interp/i-analy.boot: Likewise.
* interp/i-coerce.boot: Likewise.
* interp/i-coerfn.boot: Likewise.
* interp/i-funsel.boot: Likewise.
* interp/i-map.boot: Likewise.
* interp/i-output.boot: Likewise.
* interp/i-resolv.boot: Likewise.
* interp/i-spec1.boot: Likewise.
* interp/i-spec2.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/mark.boot: Likewise.
* interp/modemap.boot: Likewise.
* interp/pspad1.boot: Likewise.
* interp/pspad2.boot: Likewise.
* interp/spad-parser.boot: Likewise.
* interp/trace.boot: Likewise.
* interp/wi1.boot: Likewise.
* interp/wi2.boot: Likewise.
Diffstat (limited to 'src/interp/pspad1.boot')
| -rw-r--r-- | src/interp/pspad1.boot | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/interp/pspad1.boot b/src/interp/pspad1.boot index 15b5716d..eb3bc9b4 100644 --- a/src/interp/pspad1.boot +++ b/src/interp/pspad1.boot @@ -1,6 +1,6 @@ -- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd. -- All rights reserved. --- Copyright (C) 2007-2008, Gabriel Dos Reis. +-- Copyright (C) 2007-2009, Gabriel Dos Reis. -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -183,7 +183,7 @@ consBuffer item == consBuffer item nil $lineFragmentBuffer:= - ^item or IDENTP item => [PNAME item,:$lineFragmentBuffer] + null item or IDENTP item => [PNAME item,:$lineFragmentBuffer] NUMBERP item or CHARP item => [STRINGIMAGE item,:$lineFragmentBuffer] STRINGP item => ["_"",string2PrintImage item,"_"",:$lineFragmentBuffer] sayBrightly ['"Unexpected line buffer item: ", STRINGIMAGE item] @@ -498,7 +498,7 @@ formatPrefix(op,arg,lbp,rbp,:options) == formatPrefixOp(op,:options) == qualification := IFCAR options op=char '" " => format " =" - qualification or GETL(op,"Nud") and ^MEMQ(op,$spadTightList) => + qualification or GETL(op,"Nud") and not MEMQ(op,$spadTightList) => formatQual(op,qualification) and format " " format op @@ -560,7 +560,7 @@ formatOpBindingPower(op,key,leftOrRight) == MEMQ(op,'(_:)) and key = 'Led => leftOrRight = 'left => 195 196 - MEMQ(op,'(_^_= _>_=)) => 400 + MEMQ(op,'(_~_= _>_=)) => 400 op = "not" and key = "Nud" => leftOrRight = 'left => 1000 1001 @@ -572,7 +572,7 @@ formatOpBindingPower(op,key,leftOrRight) == formatInfixOp(op,:options) == qualification := IFCAR options qualification or - (op ~= '_$) and ^MEMQ(op,$spadTightList) => format " " and formatQual(op,qualification) and format " " + (op ~= '_$) and not MEMQ(op,$spadTightList) => format " " and formatQual(op,qualification) and format " " format op --====================================================================== |