diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-10-30 16:38:47 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-10-30 16:38:47 +0000 |
| commit | d76c902f18d1ee40c52372c37336631c0f81bfc8 (patch) | |
| tree | 0a79d6ab8b42d9da5cb824f2871b0e355b21296c /src/interp/sys-macros.lisp | |
| parent | fe017bc0d4dfb95fa051aaa18188506c0857707d (diff) | |
| download | open-axiom-d76c902f18d1ee40c52372c37336631c0f81bfc8.tar.gz | |
* interp/sys-macros.lisp (MKPF1): Tidy.
* interp/sys-constants.boot ($QueryVariables): New.
* interp/define.boot ($whreDecls): Remove.
(checkRepresentation): Take a DB as first parameter. Adjust Callers.
(buildConstructorCondition): New
(deduceImplicitParameters): Likewise
(compDefineCategory2): Use it.
(compDefineFunctor1): Likewise.
(typeDependencyPath): Remove.
(inferConstructorImplicitParameters): Likewise.
* interp/compiler.boot (compTopLevel): Do not bind $whereDecls.
(recordDeclarationInSideCondition): Take additional reference
parameter to the list of processed decls. Adjust callers.
(compWhere): Record any side decls in compilation environment.
* interp/c-util.boot (makeCompilationData): Initialize implicit data.
(dbParameters): New.
(dbImplicitData): New accessor macro.
(dbImplicitParameters): New.
(dbImplicitConstraints): Likewise.
(dbSubstituteFormals): Likewise.
(dbSubstituteQueries): Likewise.
* interp/database.boot (fixUpPredicate): Tidy.
* boot/utility.boot (applySubst): Early exit on identity substitution.
(applySubst!): Likewise.
(applySubstNQ): Likewise.
* boot/ast.boot (bfIS1): Accept pattern matching against Boolean
constant true.
Diffstat (limited to 'src/interp/sys-macros.lisp')
| -rw-r--r-- | src/interp/sys-macros.lisp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/interp/sys-macros.lisp b/src/interp/sys-macros.lisp index 10357fdc..966626d2 100644 --- a/src/interp/sys-macros.lisp +++ b/src/interp/sys-macros.lisp @@ -442,20 +442,20 @@ (CAR L)) ((CONS 'EXPT L)) )) (OR - (COND ((MEMBER 'T L) - ''T) + (COND ((MEMBER T L) + T) ((EQL 0 (SETQ X (LENGTH (SETQ L (REMOVE NIL L))))) NIL) ((EQL 1 X) (CAR L)) ((CONS 'OR L)) )) (|or| - (COND ((MEMBER 'T L) 'T) + (COND ((MEMBER T L) T) ((EQL 0 (SETQ X (LENGTH (SETQ L (REMOVE NIL L))))) NIL) ((EQL 1 X) (CAR L)) - ((CONS 'or L)) )) + ((CONS '|or| L)) )) (NULL (COND ((CDR L) (FAIL)) @@ -469,15 +469,15 @@ (|and| (COND ((EQL 0 (SETQ X (LENGTH - (SETQ L (REMOVE T (REMOVE '|true| L)))))) + (SETQ L (REMOVE T L))))) T) ((EQL 1 X) (CAR L)) ((CONS '|and| L)) )) (AND (COND ((EQL 0 (SETQ X (LENGTH - (SETQ L (REMOVE T (REMOVE '|true| L)))))) - ''T) + (SETQ L (REMOVE T L))))) + T) ((EQL 1 X) (CAR L)) ((CONS 'AND L)) )) |