diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-05-26 08:10:59 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-05-26 08:10:59 +0000 |
| commit | 8e0498b66e19be7e22039866d695c1cb81707bd6 (patch) | |
| tree | 162eee1a3365c43d8b35bff9eb7b23b00d6af09c /src/interp/pspad2.boot | |
| parent | 9584120cc4fd35f1ae0639430e07d5936f1ac39b (diff) | |
| download | open-axiom-8e0498b66e19be7e22039866d695c1cb81707bd6.tar.gz | |
* boot/tokens.boot: Automatically translate alphabetic?, digit?,
lowerCase?, upperCase?, readByte, readInteger, readLine,
writeByte, writeLine.
* interp/as.boot: Use them.
* interp/bc-matrix.boot: Likewise.
* interp/bc-solve.boot: Likewise.
* interp/br-con.boot: Likewise.
* interp/br-search.boot: Likewise.
* interp/br-util.boot: Likewise.
* interp/c-doc.boot: Likewise.
* interp/c-util.boot: Likewise.
* interp/database.boot: Likewise.
* interp/format.boot: Likewise.
* interp/fortcall.boot: Likewise.
* interp/functor.boot: Likewise.
* interp/g-util.boot: Likewise.
* interp/guess.boot: Likewise.
* interp/ht-root.boot: Likewise.
* interp/htcheck.boot: Likewise.
* interp/htsetvar.boot: Likewise.
* interp/i-map.boot: Likewise.
* interp/i-output.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/i-util.boot: Likewise.
* interp/int-top.boot: Likewise.
* interp/intfile.boot: Likewise.
* interp/mark.boot: Likewise.
* interp/msgdb.boot: Likewise.
* interp/pf2sex.boot: Likewise.
* interp/pspad1.boot: Likewise.
* interp/pspad2.boot: Likewise.
* interp/scan.boot: Likewise.
* interp/slam.boot: Likewise.
* interp/sys-utility.boot: Likewise.
* interp/topics.boot: Likewise.
* interp/trace.boot: Likewise.
* interp/word.boot: Likewise.
Diffstat (limited to 'src/interp/pspad2.boot')
| -rw-r--r-- | src/interp/pspad2.boot | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/interp/pspad2.boot b/src/interp/pspad2.boot index 23beaf0d..3ece41b6 100644 --- a/src/interp/pspad2.boot +++ b/src/interp/pspad2.boot @@ -566,10 +566,10 @@ ident2PrintImage s == m := MAXINDEX s if m > 1 and s.(m - 1) = $underScore then s := strconc(SUBSTRING(s,0,m-1),s.m) u:= GETSTR (2*SIZE s) - if not (ALPHA_-CHAR_-P s.(0) or s.(0)=char '"$") then SUFFIX('__,u) + if not (alphabetic? s.(0) or s.(0)=char '"$") then SUFFIX('__,u) u:= SUFFIX(s.(0),u) for i in 1..MAXINDEX s repeat - if not (DIGITP s.i or ALPHA_-CHAR_-P s.i or ((c := s.i) = char '?) + if not (digit? s.i or alphabetic? s.i or ((c := s.i) = char '?) or (c = char '_!)) then SUFFIX('__,u) u:= SUFFIX(s.i,u) INTERN u @@ -578,15 +578,15 @@ isIdentifier x == IDENTP x => s:= PNAME x #s = 0 => nil - ALPHA_-CHAR_-P s.(0) => and/[s.i ~= char '" " for i in 1..MAXINDEX s] + alphabetic? s.(0) => and/[s.i ~= char '" " for i in 1..MAXINDEX s] #s>1 => - or/[ALPHA_-CHAR_-P s.i for i in 1..(m:= MAXINDEX s)] => + or/[alphabetic? s.i for i in 1..(m:= MAXINDEX s)] => and/[s.i ~= char '" " for i in 1..m] => true isGensym x == s := STRINGIMAGE x n := MAXINDEX s - s.0 = char '_G and and/[DIGITP s.i for i in 1..n] + s.0 = char '_G and and/[digit? s.i for i in 1..n] --====================================================================== -- Macro Helpers |