diff options
| author | dos-reis <gdr@axiomatics.org> | 2007-10-22 10:25:52 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2007-10-22 10:25:52 +0000 |
| commit | a73349338f650dea30da980fe22e5c750884cc85 (patch) | |
| tree | 4d1c8e72e7be5d02c9be0c490a8c5a5817d585ef /src/interp/br-data.boot.pamphlet | |
| parent | 2ff38e852893972f6d8000a70bb4a359fb7e44df (diff) | |
| download | open-axiom-a73349338f650dea30da980fe22e5c750884cc85.tar.gz | |
* 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.
Diffstat (limited to 'src/interp/br-data.boot.pamphlet')
| -rw-r--r-- | src/interp/br-data.boot.pamphlet | 14 |
1 files changed, 7 insertions, 7 deletions
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 |