aboutsummaryrefslogtreecommitdiff
path: root/src/algebra
diff options
context:
space:
mode:
Diffstat (limited to 'src/algebra')
-rw-r--r--src/algebra/Makefile.in5
-rw-r--r--src/algebra/Makefile.pamphlet5
-rw-r--r--src/algebra/exposed.lsp.pamphlet1
-rw-r--r--src/algebra/syntax.spad.pamphlet64
4 files changed, 64 insertions, 11 deletions
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index 4068bdb5..1d773d79 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -879,7 +879,7 @@ axiom_algebra_layer_user = \
LSTAST EXITAST RETAST SEGAST PRTDAST CRCAST \
LETAST SUCHAST RDUCEAST COLONAST ADDAST CAPSLAST \
CASEAST HASAST ISAST CATAST WHEREAST COMMAAST \
- QQUTAST DEFAST MACROAST SPADXPT SPADAST \
+ QQUTAST DEFAST MACROAST SPADXPT SPADAST PARAMAST \
INBFILE OUTBFILE IOBFILE RGBCMDL RGBCSPC \
CTOR IP4ADDR NETCLT INETCLTS \
FMC FMFUN FORTFN FVC FVFUN ASP34 \
@@ -898,7 +898,8 @@ axiom_algebra_layer_user_objects = \
$(OUT)/SASTCAT.$(FASLEXT): $(OUT)/ASTCAT.$(FASLEXT)
$(OUT)/LITERAL.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT)
-$(OUT)/HEADAST.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT)
+$(OUT)/PARAMAST.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT) $(OUT)/STRING.$(FASLEXT)
+$(OUT)/HEADAST.$(FASLEXT): $(OUT)/PARAMAST.$(FASLEXT)
$(OUT)/SPADXPT.$(FASLEXT): $(OUT)/ASTCAT.$(FASLEXT)
$(OUT)/ATTRAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
$(OUT)/TYPEAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
diff --git a/src/algebra/Makefile.pamphlet b/src/algebra/Makefile.pamphlet
index 8c5299fb..f4338dfd 100644
--- a/src/algebra/Makefile.pamphlet
+++ b/src/algebra/Makefile.pamphlet
@@ -958,7 +958,7 @@ axiom_algebra_layer_user = \
LSTAST EXITAST RETAST SEGAST PRTDAST CRCAST \
LETAST SUCHAST RDUCEAST COLONAST ADDAST CAPSLAST \
CASEAST HASAST ISAST CATAST WHEREAST COMMAAST \
- QQUTAST DEFAST MACROAST SPADXPT SPADAST \
+ QQUTAST DEFAST MACROAST SPADXPT SPADAST PARAMAST \
INBFILE OUTBFILE IOBFILE RGBCMDL RGBCSPC \
CTOR IP4ADDR NETCLT INETCLTS \
FMC FMFUN FORTFN FVC FVFUN ASP34 \
@@ -977,7 +977,8 @@ axiom_algebra_layer_user_objects = \
$(OUT)/SASTCAT.$(FASLEXT): $(OUT)/ASTCAT.$(FASLEXT)
$(OUT)/LITERAL.$(FASLEXT): $(OUT)/SASTCAT.$(FASLEXT)
-$(OUT)/HEADAST.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT)
+$(OUT)/PARAMAST.$(FASLEXT): $(OUT)/IDENT.$(FASLEXT) $(OUT)/STRING.$(FASLEXT)
+$(OUT)/HEADAST.$(FASLEXT): $(OUT)/PARAMAST.$(FASLEXT)
$(OUT)/SPADXPT.$(FASLEXT): $(OUT)/ASTCAT.$(FASLEXT)
$(OUT)/ATTRAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
$(OUT)/TYPEAST.$(FASLEXT): $(OUT)/SPADXPT.$(FASLEXT)
diff --git a/src/algebra/exposed.lsp.pamphlet b/src/algebra/exposed.lsp.pamphlet
index 9b3fb41c..25bf5eef 100644
--- a/src/algebra/exposed.lsp.pamphlet
+++ b/src/algebra/exposed.lsp.pamphlet
@@ -302,6 +302,7 @@
(|Palette| . PALETTE)
(|PartialFraction| . PFR)
(|PatternFunctions2| . PATTERN2)
+ (|ParameterAst| . PARAMAST)
(|ParametricPlaneCurve| . PARPCURV)
(|ParametricSpaceCurve| . PARSCURV)
(|ParametricSurface| . PARSURF)
diff --git a/src/algebra/syntax.spad.pamphlet b/src/algebra/syntax.spad.pamphlet
index 1511b02f..924767d3 100644
--- a/src/algebra/syntax.spad.pamphlet
+++ b/src/algebra/syntax.spad.pamphlet
@@ -574,6 +574,55 @@ Identifier(): Public == Private where
@
+\subsection{The ParameterAst domain}
+
+<<domain PARAMAST ParameterAst>>=
+)abbrev domain PARAMAST ParameterAst
+++ Author: Gabriel Dos Reis
+++ Date Created: November 08, 2009
+++ Date Last Modified: November 08, 2009
+++ Description:
+++ Representation of parameters to functions or constructors.
+++ For the most part, they are Identifiers. However, in very
+++ cases, they are "flags", e.g. string literals.
+ParameterAst(): Public == Private where
+ Public == Join(SpadSyntaxCategory, UnionType) with
+ case: (%, [| Identifier |]) -> Boolean
+ ++ \spad{x case Identifier} if the parameter AST object
+ ++ \spad{x} designates an \spadtype{Identifier}.
+ autoCoerce: % -> Identifier
+ ++ \spad{autoCoerce(x)@Identifier} implicitly coerce the
+ ++ object \spad{x} to \spadtype{Identifier}. This function
+ ++ is left at the discretion of the compiler.
+ case: (%, [| String |]) -> Boolean
+ ++ \spad{x case String} if the parameter AST object
+ ++ \spad{x} designates a flag.
+ autoCoerce: % -> String
+ ++ \spad{autoCoerce(x)@String} implicitly coerce the
+ ++ object \spad{x} to \spadtype{String}. This function
+ ++ is left at the discretion of the compiler.
+ Private == add
+ x case Identifier ==
+ SYMBOLP(x)$Foreign(Builtin)
+
+ autoCoerce(x: %): Identifier ==
+ x : Identifier
+
+ x case String ==
+ STRINGP(x)$Foreign(Builtin)
+
+ autoCoerce(x: %): String ==
+ x : String
+
+ x = y ==
+ EQUAL(x,y)$Foreign(Builtin)
+
+ coerce(x: %): OutputForm ==
+ case x is
+ y@String => y::OutputForm
+ otherwise => x pretend OutputForm
+@
+
\subsection{The HeadAst domain}
@@ -584,22 +633,22 @@ import List Identifier
)abbrev domain HEADAST HeadAst
++ Author: Gabriel Dos Reis
++ Date Created: November 10, 2007
-++ Date Last Modified: September 21, 2008
+++ Date Last Modified: November 08, 2009
++ Description: This domain represents the header of a definition.
HeadAst(): Public == Private where
Public == SpadSyntaxCategory with
- headAst: (Identifier,List Identifier) -> %
+ headAst: (Identifier,List ParameterAst) -> %
++ headAst(f,[x1,..,xn]) constructs a function definition header.
name: % -> Identifier
++ name(h) returns the name of the operation defined defined.
- parameters: % -> List Identifier
+ parameters: % -> List ParameterAst
++ parameters(h) gives the parameters specified in the
++ definition header `h'.
Private == add
- Rep == List Identifier
- headAst(op,args) == per cons(op,args)
+ Rep == Pair(Identifier, List ParameterAst)
+ headAst(op,args) == per pair(op,args)
name h == first rep h
- parameters h == rest rep h
+ parameters h == second rep h
coerce(x: %): OutputForm ==
elt('HeadAst::OutputForm,
['name::OutputForm = name(x)::OutputForm,
@@ -1699,7 +1748,7 @@ SpadAst(): SpadAstExports() == add
\section{License}
<<license>>=
---Copyright (C) 2007-2008, Gabriel Dos Reis.
+--Copyright (C) 2007-2009, Gabriel Dos Reis.
--All rights reserved.
--
--Redistribution and use in source and binary forms, with or without
@@ -1742,6 +1791,7 @@ SpadAst(): SpadAstExports() == add
<<category SPADXPT SpadAstExports>>
<<domain LITERAL Literal>>
+<<domain PARAMAST ParameterAst>>
<<domain HEADAST HeadAst>>
<<domain TYPEAST TypeAst>>
<<domain ATTRAST AttributeAst>>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-09 16:28:37 +0000