* 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.

6 files changed, 96 insertions, 9 deletions

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
 
 --%