diff options
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | configure.ac.pamphlet | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 14 | ||||
| -rw-r--r-- | src/interp/i-analy.boot | 5 | ||||
| -rw-r--r-- | src/interp/i-eval.boot | 62 | ||||
| -rw-r--r-- | src/interp/i-map.boot | 4 | ||||
| -rw-r--r-- | src/interp/i-object.boot | 3 | ||||
| -rw-r--r-- | src/interp/i-output.boot | 2 | ||||
| -rw-r--r-- | src/interp/slam.boot | 2 | ||||
| -rw-r--r-- | src/interp/sys-driver.boot | 13 | ||||
| -rw-r--r-- | src/interp/trace.boot | 2 |
12 files changed, 81 insertions, 48 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-02-22. +# Generated by GNU Autoconf 2.60 for OpenAxiom 1.2.0-2008-03-03. # # Report bugs to <open-axiom-bugs@lists.sf.net>. # @@ -713,8 +713,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='OpenAxiom' PACKAGE_TARNAME='openaxiom' -PACKAGE_VERSION='1.2.0-2008-02-22' -PACKAGE_STRING='OpenAxiom 1.2.0-2008-02-22' +PACKAGE_VERSION='1.2.0-2008-03-03' +PACKAGE_STRING='OpenAxiom 1.2.0-2008-03-03' PACKAGE_BUGREPORT='open-axiom-bugs@lists.sf.net' ac_unique_file="src/Makefile.pamphlet" @@ -1387,7 +1387,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenAxiom 1.2.0-2008-02-22 to adapt to many kinds of systems. +\`configure' configures OpenAxiom 1.2.0-2008-03-03 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1457,7 +1457,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-02-22:";; + short | recursive ) echo "Configuration of OpenAxiom 1.2.0-2008-03-03:";; esac cat <<\_ACEOF @@ -1561,7 +1561,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OpenAxiom configure 1.2.0-2008-02-22 +OpenAxiom configure 1.2.0-2008-03-03 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1575,7 +1575,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenAxiom $as_me 1.2.0-2008-02-22, which was +It was created by OpenAxiom $as_me 1.2.0-2008-03-03, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -25230,7 +25230,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OpenAxiom $as_me 1.2.0-2008-02-22, which was +This file was extended by OpenAxiom $as_me 1.2.0-2008-03-03, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25279,7 +25279,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenAxiom config.status 1.2.0-2008-02-22 +OpenAxiom config.status 1.2.0-2008-03-03 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 2e59439c..c56b9e6d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-02-22], +AC_INIT([OpenAxiom], [1.2.0-2008-03-03], [open-axiom-bugs@lists.sf.net]) AC_CONFIG_AUX_DIR(config) diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet index 05ddf80e..58119a71 100644 --- a/configure.ac.pamphlet +++ b/configure.ac.pamphlet @@ -1022,7 +1022,7 @@ information: <<Autoconf init>>= sinclude(config/open-axiom.m4) sinclude(config/aclocal.m4) -AC_INIT([OpenAxiom], [1.2.0-2008-02-22], +AC_INIT([OpenAxiom], [1.2.0-2008-03-03], [open-axiom-bugs@lists.sf.net]) @ diff --git a/src/ChangeLog b/src/ChangeLog index c2ace4fe..bd891a55 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,17 @@ +2008-03-03 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/i-analy.boot (bottomUp): Don't record constructor + instantiations representations in interactive environments. + * interp/i-eval.boot (evaluateFormAsType): New. + (evaluateType): Use it. + (evaluateType1): Tidy. + * interp/i-output.boot (output): Tidy. + * interp/i-object.boot ($genValue): Define here. + * interp/sys-dirver.boot ($verbose): Rename from + $verboseInterpreter. + * interp/i-map.boot (genMapCode): Propagate $verbose renaming. + * interp/slam.boot (compileRecurrenceRelation): Likewise. + 2008-02-22 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/i-analy.boot (bottomUpFormTuple): Use "tuple" for diff --git a/src/interp/i-analy.boot b/src/interp/i-analy.boot index b4b4226d..a46c6b7a 100644 --- a/src/interp/i-analy.boot +++ b/src/interp/i-analy.boot @@ -248,6 +248,11 @@ bottomUp t == argModeSetList:= [bottomUp x for x in argl] ms := bottomUpForm(t,op,opName,argl,argModeSetList) + -- If this is a type producing form, then we don't want + -- to store the representation object in the environment. + -- Rather, we want to record the reified canonical form. + if ms is [m] and (m in $LangSupportTypes or isCategoryForm(m,$e)) + then putValue(t,objNew(devaluate objValUnwrap getValue t, m)) -- given no target or package calling, force integer constants to -- belong to tightest possible subdomain diff --git a/src/interp/i-eval.boot b/src/interp/i-eval.boot index 0eb5a136..156caec9 100644 --- a/src/interp/i-eval.boot +++ b/src/interp/i-eval.boot @@ -149,37 +149,47 @@ evaluateType form == op='Record => [op,:[['_:,sel,evaluateType type] for ['_:,sel,type] in argl]] op='Enumeration => form - evaluateType1 form + evaluateFormAsType form constructor? form => ATOM form => evaluateType [form] throwEvalTypeMsg("S2IE0003",[form,form]) + evaluateFormAsType form + +++ `form' used in a context where a type (domain or category) is +++ expected. Attempt to fully evaluate it. Error if the resulting +++ value is not a type. When successful, the result is the reified +++ canonical form of the type. +evaluateFormAsType form == + form is [op,:args] and constructor? op => evaluateType1 form + t := mkAtree form + -- ??? Maybe we should be more careful about generalized types. + bottomUp t is [m] and (m in $LangSupportTypes or isCategoryForm(m,$e)) => + objVal getValue t throwEvalTypeMsg("S2IE0004",[form]) -evaluateType1 form == - --evaluates the arguments passed to a constructor - [op,:argl]:= form - constructor? op => - null (sig := getConstructorSignature form) => - throwEvalTypeMsg("S2IE0005",[form]) - [.,:ml] := sig - ml := replaceSharps(ml,form) - # argl ^= #ml => throwEvalTypeMsg("S2IE0003",[form,form]) - for x in argl for m in ml for argnum in 1.. repeat - typeList := [v,:typeList] where v() == - categoryForm?(m) => - m := evaluateType MSUBSTQ(x,'_$,m) - evalCategory(x' := (evaluateType x), m) => x' - throwEvalTypeMsg("S2IE0004",[form]) - m := evaluateType m - GETDATABASE(opOf m,'CONSTRUCTORKIND) = 'domain and - (tree := mkAtree x) and putTarget(tree,m) and ((bottomUp tree) is [m1]) => - [zt,:zv]:= z1:= getAndEvalConstructorArgument tree - (v' := coerceOrRetract(z1,m)) => objValUnwrap v' - throwKeyedMsgCannotCoerceWithValue(zv,zt,m) - if x = $EmptyMode then x := $quadSymbol - throwEvalTypeMsg("S2IE0006",[makeOrdinal argnum,m,form]) - [op,:NREVERSE typeList] - throwEvalTypeMsg("S2IE0007",[op]) +++ evaluates the arguments passed to the constructor `op'. +++ Note: only constructor instantiations go here. +evaluateType1 (form is [op,:argl]) == + null (sig := getConstructorSignature form) => + throwEvalTypeMsg("S2IE0005",[form]) + [.,:ml] := sig + ml := replaceSharps(ml,form) + # argl ^= #ml => throwEvalTypeMsg("S2IE0003",[form,form]) + for x in argl for m in ml for argnum in 1.. repeat + typeList := [v,:typeList] where v() == + categoryForm?(m) => + m := evaluateType MSUBSTQ(x,'_$,m) + evalCategory(x' := (evaluateType x), m) => x' + throwEvalTypeMsg("S2IE0004",[form]) + m := evaluateType m + GETDATABASE(opOf m,'CONSTRUCTORKIND) = 'domain and + (tree := mkAtree x) and putTarget(tree,m) and ((bottomUp tree) is [m1]) => + [zt,:zv]:= z1:= getAndEvalConstructorArgument tree + (v' := coerceOrRetract(z1,m)) => objValUnwrap v' + throwKeyedMsgCannotCoerceWithValue(zv,zt,m) + if x = $EmptyMode then x := $quadSymbol + throwEvalTypeMsg("S2IE0006",[makeOrdinal argnum,m,form]) + [op,:nreverse typeList] throwEvalTypeMsg(msg, args) == $noEvalTypeMsg => spadThrow() diff --git a/src/interp/i-map.boot b/src/interp/i-map.boot index 7d0d2b27..882763df 100644 --- a/src/interp/i-map.boot +++ b/src/interp/i-map.boot @@ -710,8 +710,8 @@ genMapCode(op,body,sig,fnName,parms,isRecursive) == op0 := ( n := isSharpVarWithNum op ) => STRCONC('"<argument ",object2String n,'">") op - if $verboseInterprerter then - if $verboseInterprerter and get(op,'isInterpreterRule,$e) then + if $verbose then + if get(op,'isInterpreterRule,$e) then sayKeyedMsg("S2IM0014",[op0,(PAIRP sig =>prefix2String CAR sig;'"?")]) else sayKeyedMsg("S2IM0015",[op0,formatSignature sig]) $whereCacheList := [op,:$whereCacheList] diff --git a/src/interp/i-object.boot b/src/interp/i-object.boot index 07fda0f6..77252919 100644 --- a/src/interp/i-object.boot +++ b/src/interp/i-object.boot @@ -34,6 +34,9 @@ import '"g-util" )package "BOOT" +++ true when the interpreter should evaluate forms to values, as +++ opposed to just generating code to compute values. +$genValue := true ++ true if we are about to generate a function definition $definingMap := false diff --git a/src/interp/i-output.boot b/src/interp/i-output.boot index ca2a31d8..f08cf82f 100644 --- a/src/interp/i-output.boot +++ b/src/interp/i-output.boot @@ -1383,7 +1383,7 @@ output(expr,domain) == if $formulaFormat then formulaFormat expr if $texFormat then texFormat expr if $algebraFormat then mathprintWithNumber expr - categoryForm? domain or domain in '((Mode) (Type)) => + categoryForm? domain or domain in '((Mode) (Domain) (Type)) => if $algebraFormat then mathprintWithNumber outputDomainConstructor expr if $texFormat then diff --git a/src/interp/slam.boot b/src/interp/slam.boot index 0bc23423..705f235f 100644 --- a/src/interp/slam.boot +++ b/src/interp/slam.boot @@ -241,7 +241,7 @@ compileRecurrenceRelation(op,nam,argl,junk,[body,sharpArg,n,:initCode]) == ["ELT",["LIST",:initCode],["QSDIFFERENCE",n,sharpArg]]] phrase5:= ['(QUOTE T),['recurrenceError,MKQ op,sharpArg]] ['PROGN,:preset,['COND,phrase1,phrase2,phrase3,phrase4,phrase5]] - if $verboseInterprerter then + if $verbose then sayKeyedMsg("S2IX0001",[op]) compileInteractive computeFunction compileInteractive mainFunction diff --git a/src/interp/sys-driver.boot b/src/interp/sys-driver.boot index e6faafe4..9b35d618 100644 --- a/src/interp/sys-driver.boot +++ b/src/interp/sys-driver.boot @@ -48,10 +48,11 @@ $SpadServerName == '"/tmp/.d" ++ true means that the core executable acts as remote server. $SpadServer := false -++ if true, then the interpreter informs about code generation, etc. -$verboseInterprerter := true +++ if true, then the interpreter or compiler should inform about +++ code generation, etc. +$verbose := true -$PrintCompilerMessageIfTrue := true +$PrintCompilerMessageIfTrue := $verbose ++ $options := [] @@ -194,11 +195,11 @@ executeSpadScript(progname,options,file) == $NEWSPAD := true $SPAD := true if getOption(Option '"verbose",%systemOptions()) then - $verboseInterprerter := true + $verbose := true $options := [] $ProcessInteractiveValue := false else - $verboseInterprerter := false + $verbose := false $options := [["quiet"]] $ProcessInteractiveValue := true CATCH($intCoerceFailure, @@ -223,7 +224,7 @@ compileSpadLibrary(progname,options,file) == $SPAD := true $EchoLines := false ECHO_-META : fluid := false - $verboseInterprerter := false + $verbose := false $ProcessInteractiveValue := true CATCH($intTopLevel, CATCH("SpadCompileItem", diff --git a/src/interp/trace.boot b/src/interp/trace.boot index e6ee0e90..d6770d54 100644 --- a/src/interp/trace.boot +++ b/src/interp/trace.boot @@ -75,7 +75,7 @@ $lastUntraced := NIL trace l == traceSpad2Cmd l traceSpad2Cmd l == - if l is ['Tuple, l1] then l := l1 + if l is ["Tuple", l1] then l := l1 $mapSubNameAlist:= getMapSubNames(l) trace1 augmentTraceNames(l,$mapSubNameAlist) traceReply() |