diff options
| author | johnvg | 2011-11-10 11:11:15 +0000 |
|---|---|---|
| committer | johnvg | 2011-11-10 11:11:15 +0000 |
| commit | 0f4beed66fd4218082c433ffe5ed8f260332036a (patch) | |
| tree | 641585b055150819b2fd836f7cad1742c1290fbc /frontend/syntax.dcl | |
| parent | add module expand_types containing some functions from module trans and modul... (diff) | |
move type TypeCodeVariableInfo to module syntax, remove type DynamicValueAliasInfo,
adjust imports
git-svn-id: https://svn.cs.ru.nl/repos/clean-compiler/trunk@2027 1f8540f1-abd5-4d5b-9d24-4c5ce8603e2d
Diffstat (limited to 'frontend/syntax.dcl')
| -rw-r--r-- | frontend/syntax.dcl | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/frontend/syntax.dcl b/frontend/syntax.dcl index 0c7e306..7ce1a1a 100644 --- a/frontend/syntax.dcl +++ b/frontend/syntax.dcl @@ -5,7 +5,6 @@ import StdEnv import scanner, general, typeproperties, Heap import IndexType from containers import ::NumberSet -from convertDynamics import :: TypeCodeVariableInfo, :: DynamicValueAliasInfo from convertcases import :: LetVarInfo, :: LetExpressionInfo, :: RefCountsInCase, :: SplitsInCase :: Ident = @@ -707,8 +706,6 @@ pIsSafe :== True :: AP_Kind = APK_Constructor !Index | APK_NewTypeConstructor !Index | APK_Macro !Bool // is_dcl_macro -from convertDynamics import :: TypeCodeVariableInfo, :: DynamicValueAliasInfo - :: VI_TypeInfo = VITI_Empty | VITI_Coercion CoercionPosition | VITI_PatternType [AType] /*module*/!Index /*constructor*/!Index VI_TypeInfo @@ -740,7 +737,7 @@ from convertDynamics import :: TypeCodeVariableInfo, :: DynamicValueAliasInfo VI_Record ![AuxiliaryPattern] | VI_Pattern !AuxiliaryPattern | VI_TypeCodeVariable !TypeCodeVariableInfo | - VI_DynamicValueAlias !DynamicValueAliasInfo | + VI_DynamicValueAlias !BoundVar | VI_Body !SymbIdent !TransformedBody ![FreeVar] | /* used during fusion */ VI_ExpressionOrBody !Expression !SymbIdent !TransformedBody ![FreeVar] | /* used during fusion */ VI_Dictionary !SymbIdent ![Expression] !Type | /* used during fusion */ @@ -751,6 +748,11 @@ from convertDynamics import :: TypeCodeVariableInfo, :: DynamicValueAliasInfo | VI_Labelled_Empty !{#Char} // RWS debugging | VI_LocalLetVar // RWS, mark Let vars during case transformation +:: TypeCodeVariableInfo + = TCI_TypeVar !Expression + | TCI_TypePatternVar !Expression + | TCI_SelectionsTypePatternVar ![(Expression,[Selection])] + :: ExtendedVarInfo = EVI_VarType !AType :: ArgumentPosition :== Int @@ -758,9 +760,6 @@ from convertDynamics import :: TypeCodeVariableInfo, :: DynamicValueAliasInfo :: VarHeap :== Heap VarInfo :: VarInfoPtr :== Ptr VarInfo -from convertcases import :: LetVarInfo, :: LetExpressionInfo, - :: RefCountsInCase, :: SplitsInCase - cNotVarNumber :== -1 :: BoundVar = |