diff options
| -rwxr-xr-x | configure | 51 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/algebra/Makefile.in | 30 | ||||
| -rw-r--r-- | src/algebra/Makefile.pamphlet | 30 | ||||
| -rw-r--r-- | src/algebra/exposed.lsp.pamphlet | 15 | ||||
| -rw-r--r-- | src/algebra/syntax.spad.pamphlet | 7 | ||||
| -rw-r--r-- | src/interp/g-util.boot | 16 |
8 files changed, 120 insertions, 37 deletions
@@ -884,7 +884,6 @@ int_type float_type double_type string_type -pointer_type LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -3799,7 +3798,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3802 "configure"' > conftest.$ac_ext + echo '#line 3801 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6944,11 +6943,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6947: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6946: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6951: \$? = $ac_status" >&5 + echo "$as_me:6950: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7212,11 +7211,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7215: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7214: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7219: \$? = $ac_status" >&5 + echo "$as_me:7218: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7316,11 +7315,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7319: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7318: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7323: \$? = $ac_status" >&5 + echo "$as_me:7322: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9768,7 +9767,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9771 "configure" +#line 9770 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9868,7 +9867,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9871 "configure" +#line 9870 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12236,11 +12235,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12239: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12238: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12243: \$? = $ac_status" >&5 + echo "$as_me:12242: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12340,11 +12339,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12343: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12342: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12347: \$? = $ac_status" >&5 + echo "$as_me:12346: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13910,11 +13909,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13913: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13912: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13917: \$? = $ac_status" >&5 + echo "$as_me:13916: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14014,11 +14013,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14017: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14016: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14021: \$? = $ac_status" >&5 + echo "$as_me:14020: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16244,11 +16243,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16247: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16246: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16251: \$? = $ac_status" >&5 + echo "$as_me:16250: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16512,11 +16511,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16515: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16514: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16519: \$? = $ac_status" >&5 + echo "$as_me:16518: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16616,11 +16615,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16619: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16618: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16623: \$? = $ac_status" >&5 + echo "$as_me:16622: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -25681,7 +25680,6 @@ esac - ac_config_files="$ac_config_files Makefile:config/var-def.mk:Makefile.in:config/setup-dep.mk" ac_config_files="$ac_config_files src/Makefile:config/var-def.mk:src/Makefile.in:config/setup-dep.mk" @@ -26511,12 +26509,11 @@ int_type!$int_type$ac_delim float_type!$float_type$ac_delim double_type!$double_type$ac_delim string_type!$string_type$ac_delim -pointer_type!$pointer_type$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.ac b/configure.ac index 1e9ca9ed..f30a4ed3 100644 --- a/configure.ac +++ b/configure.ac @@ -629,7 +629,6 @@ AC_SUBST(int_type) AC_SUBST(float_type) AC_SUBST(double_type) AC_SUBST(string_type) -AC_SUBST(pointer_type) AXIOM_MAKEFILE([Makefile]) AXIOM_MAKEFILE([src/Makefile]) diff --git a/src/ChangeLog b/src/ChangeLog index c496df65..930b62b5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2008-09-19 Gabriel Dos Reis <gdr@cs.tamu.edu> + + * interp/g-util.boot (getTypeOfSyntax): Infer more syntax domains. + * algebra/Makefile.pamphlet: Add dependency rules for syntax + domains. + * algebra/exposed.lsp.pamphlet: Expose more syntax domains. + 2008-09-18 Gabriel Dos Reis <gdr@cs.tamu.edu> * interp/lisplib.boot (getConstructorSignature): Relax. diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index 6c8fcb4e..0da21709 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -842,6 +842,36 @@ ATTRAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) TYPEAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) IMPTAST.NRLIB/code.$(FASLEXT): $(OUT)/TYPEAST.$(FASLEXT) MAPPAST.NRLIB/code.$(FASLEXT): $(OUT)/TYPEAST.$(FASLEXT) +SIGAST.NRLIB/code.$(FASLEXT): $(OUT)/SIG.$(FASLEXT) +JOINAST.NRLIB/code.$(FASLEXT): $(OUT)/TYPEAST.$(FASLEXT) +IFAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +RPTAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +WHILEAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +INAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +CLLCTAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +LSTAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +EXITAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +RETAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +SEGAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +SEQAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +PRTDAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +CRCEAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +RSTRCAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +LETAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +RDUCEAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +SUCHTAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +COLONAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +ADDAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +CAPSLAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +CASEAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +HASEAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +ISAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +CATAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +WHEREAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +COMMAAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +QQUTAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +DEFAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +MACROAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) .PHONY: all all-algebra mkdir-output-directory all: all-ax diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet index f0518711..3c489670 100644 --- a/src/algebra/Makefile.pamphlet +++ b/src/algebra/Makefile.pamphlet @@ -1269,6 +1269,36 @@ ATTRAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) TYPEAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) IMPTAST.NRLIB/code.$(FASLEXT): $(OUT)/TYPEAST.$(FASLEXT) MAPPAST.NRLIB/code.$(FASLEXT): $(OUT)/TYPEAST.$(FASLEXT) +SIGAST.NRLIB/code.$(FASLEXT): $(OUT)/SIG.$(FASLEXT) +JOINAST.NRLIB/code.$(FASLEXT): $(OUT)/TYPEAST.$(FASLEXT) +IFAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +RPTAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +WHILEAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +INAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +CLLCTAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +LSTAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +EXITAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +RETAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +SEGAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +SEQAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +PRTDAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +CRCEAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +RSTRCAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +LETAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +RDUCEAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +SUCHTAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +COLONAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +ADDAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +CAPSLAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +CASEAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +HASEAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +ISAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +CATAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +WHEREAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +COMMAAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +QQUTAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +DEFAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) +MACROAST.NRLIB/code.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT) @ \section{Broken Files} diff --git a/src/algebra/exposed.lsp.pamphlet b/src/algebra/exposed.lsp.pamphlet index da109105..7f082895 100644 --- a/src/algebra/exposed.lsp.pamphlet +++ b/src/algebra/exposed.lsp.pamphlet @@ -88,6 +88,8 @@ (|CharacterClass| . CCLASS) (|CharacteristicPolynomialPackage| . CHARPOL) (|CliffordAlgebra| . CLIF) + (|CoerceAst| . CRCEAST) + (|CollectAst| . CLLCTAST) (|Color| . COLOR) (|CommaAst| . COMMAAST) (|CommonDenominator| . CDEN) @@ -98,6 +100,7 @@ (|ComplexRootPackage| . CMPLXRT) (|ComplexTrigonometricManipulations| . CTRIGMNP) (|ColonAst| . COLONAST) + (|ConstructAst| . LSTAST) (|ConstructorCall| . CTORCALL) (|ContinuedFraction| . CONTFRAC) (|Contour| . CONTOUR) @@ -134,6 +137,7 @@ (|ErrorFunctions| . ERROR) (|EuclideanGroebnerBasisPackage| . GBEUCLID) (|Exit| . EXIT) + (|ExitAst| . EXITAST) (|Expression| . EXPR) (|ExpressionFunctions2| . EXPR2) (|ExpressionSpaceFunctions2| . ES2) @@ -185,6 +189,8 @@ (|Hostname| . HOSTNAME) (|IdealDecompositionPackage| . IDECOMP) (|Identifier| . IDENT) + (|IfAst| . IFAST) + (|ImportAst| . IMPTAST) (|IndexCard| . ICARD) (|InfiniteProductCharacteristicZero| . INFPROD0) (|InfiniteProductFiniteField| . INPRODFF) @@ -211,6 +217,7 @@ (|IrrRepSymNatPackage| . IRSN) (|IsAst| . ISAST) (|JavaBytecode| . JAVACODE) + (|JoinAst| . JOINAST) (|KernelFunctions2| . KERNEL2) (|KeyedAccessFile| . KAFILE) (|LaplaceTransform| . LAPLACE) @@ -231,6 +238,7 @@ (|MakeFloatCompiledFunction| . MKFLCFN) (|MakeFunction| . MKFUNC) (|MakeRecord| . MKRECORD) + (|MappingAst| . MAPPAST) (|MappingPackage1| . MAPPKG1) (|MappingPackage2| . MAPPKG2) (|MappingPackage3| . MAPPKG3) @@ -318,6 +326,7 @@ (|PortNumber| . PORTNUM) (|PositiveInteger| . PI) (|PowerSeriesLimitPackage| . LIMITPS) + (|PretendAst| . PRTDAST) (|PrimeField| . PF) (|PrimitiveArrayFunctions2| . PRIMARR2) (|PrintPackage| . PRINT) @@ -352,9 +361,12 @@ (|RegularSetDecompositionPackage| . RSDCMPK) (|RegularTriangularSet| . REGSET) (|RegularTriangularSetGcdPackage| . RSETGCD) + (|RepeatAst| . RPTAST) (|RepresentationPackage1| . REP1) (|RepresentationPackage2| . REP2) (|ResolveLatticeCompletion| . RESLATC) + (|RestrictAst| . RSTRCAST) + (|ReturnAst| . RETAST) (|RewriteRule| . RULE) (|RightOpenIntervalRootCharacterization| . ROIRC) (|RomanNumeral| . ROMAN) @@ -369,6 +381,7 @@ (|SegmentFunctions2| . SEG2) (|SequenceAst| . SEQAST) (|Set| . SET) + (|SignatureAst| . SIGAST) (|SimpleAlgebraicExtensionAlgFactor| . SAEFACT) (|SimplifyAlgebraicNumberConvertPackage| . SIMPAN) (|SingleInteger| . SINT) @@ -410,6 +423,7 @@ (|TransSolvePackage| . SOLVETRA) (|Tree| . TREE) (|TrigonometricManipulations| . TRIGMNIP) + (|TypeAst| . TYPEAST) (|UnivariateLaurentSeriesFunctions2| . ULS2) (|UnivariatePolynomial| . UP) (|UnivariatePolynomialCategoryFunctions2| . UPOLYC2) @@ -425,6 +439,7 @@ (|VectorFunctions2| . VECTOR2) (|ViewDefaultsPackage| . VIEWDEF) (|Void| . VOID) + (|WhileAst| . WHILEAST) (|WuWenTsunTriangularSet| . WUTSET) ) (|naglink| diff --git a/src/algebra/syntax.spad.pamphlet b/src/algebra/syntax.spad.pamphlet index 04018708..b8d68f84 100644 --- a/src/algebra/syntax.spad.pamphlet +++ b/src/algebra/syntax.spad.pamphlet @@ -1021,8 +1021,8 @@ PretendAst(): Public == Private where \subsection{The CoerceAst domain} -<<domain CRCAST CoercedAst>>= -)abbrev domain CRCAST CoerceAst +<<domain CRCEAST CoercedAst>>= +)abbrev domain CRCEAST CoerceAst ++ Author: Gabriel Dos Reis ++ Date Created: November 10, 2007 ++ Date Last Modified: August 30, 2008 @@ -1417,6 +1417,7 @@ MacroAst(): Public == Private where <<*>>= <<license>> <<domain SYNTAX Syntax>> +<<domain SIG Signature>> <<domain CTORCALL ConstructorCall>> <<domain ELABEXPR ElaboratedExpression>> @@ -1443,7 +1444,7 @@ MacroAst(): Public == Private where <<domain SEGAST SegmentAst>> <<domain SEQAST SequenceAst>> <<domain PRTDAST PretendAst>> -<<domain CRCAST CoercedAst>> +<<domain CRCEAST CoercedAst>> <<domain RSTRCAST RestrictAst>> <<domain LETAST LetAst>> diff --git a/src/interp/g-util.boot b/src/interp/g-util.boot index 220518ee..6786fa83 100644 --- a/src/interp/g-util.boot +++ b/src/interp/g-util.boot @@ -127,9 +127,6 @@ getTypeOfSyntax t == $Syntax [op,:.] := t op = "Mapping" => '(MappingAst) - op = "Join" => '(JoinAst) - op in '(%Import import) => '(ImportAst) - op in '(%Signature SIGNATURE) => '(SignatureAst) op = "QUOTE" and #t = 2 and IDENTP second t => ["Literal",$Symbol] op = "IF" => '(IfAst) op = "REPEAT" => '(RepeatAst) @@ -147,14 +144,21 @@ getTypeOfSyntax t == op = "%LET" => '(LetAst) op = "|" => '(SuchThatAst) op = ":" => '(ColonAst) - op = "CAPSULE" => '(CapsuleAst) + op = ":=" => '(LetAst) + op = "%Comma" => '(CommaAst) op = "case" => '(CaseAst) op = "has" => '(HasAst) op = "is" => '(IsAst) - op = "CATEGORY" => '(CategoryAst) op = "DEF" => '(DefinitionAst) - op = "MDEF" => '(MacroAst) + op in '(MDEF %Macro) => '(MacroAst) + op = "where" => '(WhereAst) op in '(ATTRIBUTE %Attribute) => '(AttributeAst) + op = "Join" => '(JoinAst) + op = "CAPSULE" => '(CapsuleAst) + op in '(%Import import) => '(ImportAst) + op in '(%Signature SIGNATURE) => '(SignatureAst) + op = "CATEGORY" => '(CategoryAst) + op = "[||]" => '(QuasiquoteAst) $Syntax --% |