diff options
| -rw-r--r-- | src/interp/ChangeLog | 8 | ||||
| -rw-r--r-- | src/interp/br-data.boot.pamphlet | 14 | ||||
| -rw-r--r-- | src/interp/define.boot.pamphlet | 7 | ||||
| -rw-r--r-- | src/interp/i-syscmd.boot.pamphlet | 10 | ||||
| -rw-r--r-- | src/interp/mark.boot | 2 | ||||
| -rw-r--r-- | src/interp/wi2.boot | 6 |
6 files changed, 28 insertions, 19 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog index 65143060..37b13828 100644 --- a/src/interp/ChangeLog +++ b/src/interp/ChangeLog @@ -1,5 +1,13 @@ 2007-10-22 Gabriel Dos Reis <gdr@cs.tamu.edu> + * br-data.boot.pamphlet (getImports): Rename `import' to `doImport'. + * define.boot.pamphlet (hasSigInTargetCategory): Pretty-print + signature in diagnostics. + * i-syscmd.boot.pamphlet: Fix syntax. + * mark.boot: Likewise. + +2007-10-22 Gabriel Dos Reis <gdr@cs.tamu.edu> + * i-object.boot (mkObj): Remove. (mkObjWrap): Likewise. (mkObjCode): Likewise. diff --git a/src/interp/br-data.boot.pamphlet b/src/interp/br-data.boot.pamphlet index 4058c4e1..fbee7b8f 100644 --- a/src/interp/br-data.boot.pamphlet +++ b/src/interp/br-data.boot.pamphlet @@ -486,26 +486,26 @@ getImports conname == --called by mkUsersHashTable conform := GETDATABASE(conname,'CONSTRUCTORFORM) infovec := dbInfovec conname or return nil template := infovec.0 - u := [import(i,template) + u := [doImport(i,template) for i in 5..(MAXINDEX template) | test] where test == template.i is [op,:.] and IDENTP op and not MEMQ(op,'(Mapping Union Record Enumeration CONS QUOTE local)) - import(x,template) == + doImport(x,template) == x is [op,:args] => op = 'QUOTE or op = 'NRTEVAL => CAR args op = 'local => first args op = 'Record => - ['Record,:[[":",CADR y,import(CADDR y,template)] for y in args]] + ['Record,:[[":",CADR y,doImport(CADDR y,template)] for y in args]] --TTT next three lines: handles some tagged/untagged Union case. op = 'Union=> args is [['_:,:x1],:x2] => -- CAAR args = '_: => -- tagged! - ['Union,:[[":",CADR y,import(CADDR y,template)] for y in args]] - [op,:[import(y,template) for y in args]] + ['Union,:[[":",CADR y,doImport(CADDR y,template)] for y in args]] + [op,:[doImport(y,template) for y in args]] - [op,:[import(y,template) for y in args]] - INTEGERP x => import(template.x,template) + [op,:[doImport(y,template) for y in args]] + INTEGERP x => doImport(template.x,template) x = '$ => '$ x = "$$" => "$$" STRINGP x => x diff --git a/src/interp/define.boot.pamphlet b/src/interp/define.boot.pamphlet index db8adaf8..cf6ba96a 100644 --- a/src/interp/define.boot.pamphlet +++ b/src/interp/define.boot.pamphlet @@ -894,7 +894,8 @@ hasSigInTargetCategory(argl,form,opsig,e) == 0=c => (#(sig:= getSignatureFromMode(form,e))=#form => sig; nil) 1<c => sig:= first potentialSigList - stackWarning ["signature of lhs not unique:",:bright sig,"chosen"] + stackWarning ["signature of lhs not unique:", + :bright formatSignature sig, "chosen"] sig nil --this branch will force all arguments to be declared @@ -1263,7 +1264,7 @@ doIt(item,$predl) == --This will RPLAC as appropriate isDomainForm(item,$e) => -- convert naked top level domains to import - u:= ['import, [first item,:rest item]] + u:= ["import", [first item,:rest item]] stackWarning ["Use: import ", [first item,:rest item]] RPLACA(item,first u) RPLACD(item,rest u) @@ -1302,7 +1303,7 @@ doIt(item,$predl) == RPLACA(item,first code) RPLACD(item,rest code) item is [":",a,t] => [.,.,$e]:= compOrCroak(item,$EmptyMode,$e) - item is ['import,:doms] => + item is ["import",:doms] => for dom in doms repeat sayBrightly ['" importing ",:formatUnabbreviated dom] [.,.,$e] := compOrCroak(item,$EmptyMode,$e) diff --git a/src/interp/i-syscmd.boot.pamphlet b/src/interp/i-syscmd.boot.pamphlet index 369ef713..8bffe842 100644 --- a/src/interp/i-syscmd.boot.pamphlet +++ b/src/interp/i-syscmd.boot.pamphlet @@ -1224,13 +1224,13 @@ frameSpad2Cmd args == arg = 'drop => args and PAIRP(args) => throwKeyedMsg("S2IZ0017",[args]) closeInterpreterFrame(args) - arg = 'import => importFromFrame args - arg = 'last => previousInterpreterFrame() - arg = 'names => displayFrameNames() - arg = 'new => + arg = "import" => importFromFrame args + arg = "last" => previousInterpreterFrame() + arg = "names" => displayFrameNames() + arg = "new" => args and PAIRP(args) => throwKeyedMsg("S2IZ0017",[args]) addNewInterpreterFrame(args) - arg = 'next => nextInterpreterFrame() + arg = "next" => nextInterpreterFrame() NIL diff --git a/src/interp/mark.boot b/src/interp/mark.boot index 333beb67..95efaf83 100644 --- a/src/interp/mark.boot +++ b/src/interp/mark.boot @@ -950,7 +950,7 @@ markRemImportsAndLeadingMacros(leadingMacros,body) == mkNewCapsuleItem(frees,i,x) == [originalDef,:ndef] := x imports := REVERSE orderByContainment REMDUP SETDIFFERENCE(i,$finalImports) - importPart := [['import,d] for d in imports] + importPart := [["import",d] for d in imports] nbody := ndef is ['LET,.,x] => x ndef is ['DEF,.,.,.,x] => x diff --git a/src/interp/wi2.boot b/src/interp/wi2.boot index 4c8035ac..fddd93ca 100644 --- a/src/interp/wi2.boot +++ b/src/interp/wi2.boot @@ -1054,8 +1054,8 @@ doIt(item,$predl) == item is [":",a,t] => [.,.,$e]:= markDeclaredImport markKillAll t compOrCroak(item,$EmptyMode,$e) - item is ['import,:doms] => - item := ['import,:(doms := markKillAll doms)] + item is ["import",:doms] => + item := ["import",:(doms := markKillAll doms)] for dom in doms repeat sayBrightly ['" importing ",:formatUnabbreviated dom] [.,.,$e] := compOrCroak(item,$EmptyMode,$e) @@ -1119,7 +1119,7 @@ doItSeq item == doItDomain item == -- convert naked top level domains to import - u:= ['import, [first item,:rest item]] + u:= ["import", [first item,:rest item]] markImport CADR u stackWarning ["Use: import ", [first item,:rest item]] --wiReplaceNode(item, u, 14) |