diff options
Diffstat (limited to 'src/interp/format.boot')
| -rw-r--r-- | src/interp/format.boot | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/interp/format.boot b/src/interp/format.boot index d3d974f9..8cc64896 100644 --- a/src/interp/format.boot +++ b/src/interp/format.boot @@ -182,7 +182,7 @@ reportOpSymbol op1 == sayKeyedMsg("S2IF0010",[op1]) if SIZE PNAME op1 < 3 then x := UPCASE queryUserKeyedMsg("S2IZ0060",[op1]) - null MEMQ(STRING2ID_-N(x,1),'(Y YES)) => + null (STRING2ID_-N(x,1) in '(Y YES)) => ok := nil sayKeyedMsg("S2IZ0061",[op1]) ok => apropos [op1] @@ -419,7 +419,7 @@ form2String1 u == null argl => [ '":" ] null rest argl => [ '":", form2String1 first argl ] formDecl2String(argl.0,argl.1) - op = "#" and PAIRP argl and LISTP CAR argl => + op = "#" and CONSP argl and LISTP CAR argl => STRINGIMAGE SIZE CAR argl op = 'Join => formJoin2String argl op = "ATTRIBUTE" => form2String1 first argl @@ -461,7 +461,7 @@ formArguments2String(argl,ml) == [fn(x,m) for x in argl for m in ml] where x=$EmptyMode or x=$quadSymbol => specialChar 'quad STRINGP(x) or IDENTP(x) => x x is [ ='_:,:.] => form2String1 x - isValidType(m) and PAIRP(m) and + isValidType(m) and CONSP(m) and (getConstructorKindFromDB first(m) = "domain") => (x' := coerceInteractive(objNewWrap(x,m),$OutputForm)) => form2String1 objValUnwrap x' @@ -559,7 +559,7 @@ tuple2String argl == script2String s == null s => '"" -- just to be safe - if not PAIRP s then s := [s] + if atom s then s := [s] linearFormatForm(CAR s, CDR s) linearFormatName x == @@ -734,7 +734,7 @@ object2String x == STRINGP x => x IDENTP x => PNAME x NULL x => '"" - PAIRP x => STRCONC(object2String first x, object2String rest x) + CONSP x => STRCONC(object2String first x, object2String rest x) WRITE_-TO_-STRING x object2Identifier x == @@ -745,7 +745,7 @@ object2Identifier x == blankList x == "append"/[[BLANK,y] for y in x] pkey keyStuff == - if not PAIRP keyStuff then keyStuff := [keyStuff] + if atom keyStuff then keyStuff := [keyStuff] allMsgs := ['" "] while not null keyStuff repeat dbN := NIL @@ -753,7 +753,7 @@ pkey keyStuff == key := first keyStuff keyStuff := IFCDR keyStuff next := IFCAR keyStuff - while PAIRP next repeat + while CONSP next repeat if CAR next = 'dbN then dbN := CADR next else argL := next keyStuff := IFCDR keyStuff |