diff options
-rw-r--r-- | backend/backendconvert.dcl | 5 | ||||
-rw-r--r-- | backend/backendsupport.dcl | 9 | ||||
-rw-r--r-- | backend/backendsupport.icl | 7 | ||||
-rw-r--r-- | frontend/compilerSwitches.dcl | 2 | ||||
-rw-r--r-- | frontend/compilerSwitches.icl | 2 | ||||
-rw-r--r-- | frontend/containers.dcl | 6 | ||||
-rw-r--r-- | frontend/convertDynamics.icl | 2 | ||||
-rw-r--r-- | frontend/frontend.dcl | 6 | ||||
-rw-r--r-- | frontend/general.dcl | 5 | ||||
-rw-r--r-- | frontend/generics.dcl | 5 | ||||
-rw-r--r-- | frontend/generics.icl | 7 | ||||
-rw-r--r-- | frontend/typesupport.dcl | 5 | ||||
-rw-r--r-- | frontend/utilities.dcl | 6 | ||||
-rw-r--r-- | main/Windows/CoclSystemDependent.dcl | 5 | ||||
-rw-r--r-- | main/compile.dcl | 6 | ||||
-rw-r--r-- | main/filesystem.dcl | 5 |
16 files changed, 72 insertions, 11 deletions
diff --git a/backend/backendconvert.dcl b/backend/backendconvert.dcl index 83711e7..5d9434b 100644 --- a/backend/backendconvert.dcl +++ b/backend/backendconvert.dcl @@ -3,7 +3,12 @@ */ definition module backendconvert +/*2.0 +from backend import ::BackEnd +0.2*/ +//1.3 from backend import BackEnd +//3.1 import frontend backEndConvertModules :: PredefinedSymbols FrontEndSyntaxTree !Int *VarHeap *AttrVarHeap *BackEnd -> (!*VarHeap, *AttrVarHeap, !*BackEnd) diff --git a/backend/backendsupport.dcl b/backend/backendsupport.dcl index df885f8..bd95fa1 100644 --- a/backend/backendsupport.dcl +++ b/backend/backendsupport.dcl @@ -3,14 +3,15 @@ */ definition module backendsupport +/*2.0 +from StdArray import class Array(size,usize) +from StdInt import class +,class == +0.2*/ //1.3 from StdArray import size, size_u +from StdInt import +, == //3.1 -/*2.0 -from StdArray import size, usize -0.2*/ from StdFunc import `bind` -from StdInt import +, == import utilities diff --git a/backend/backendsupport.icl b/backend/backendsupport.icl index ae3c873..ba7677b 100644 --- a/backend/backendsupport.icl +++ b/backend/backendsupport.icl @@ -4,8 +4,13 @@ implementation module backendsupport import StdArray -from StdFunc import `bind` +/*2.0 +from StdInt import class + (..),class == (..) +0.2*/ +//1.3 from StdInt import +, == +//3.1 +from StdFunc import `bind` identity :== \x -> x diff --git a/frontend/compilerSwitches.dcl b/frontend/compilerSwitches.dcl index 4377a37..72a3822 100644 --- a/frontend/compilerSwitches.dcl +++ b/frontend/compilerSwitches.dcl @@ -2,7 +2,7 @@ definition module compilerSwitches PA_BUG on off :== off -switch_import_syntax one_point_three two_point_zero :== one_point_three +switch_import_syntax one_point_three two_point_zero :== two_point_zero /* when finally removing this switch also remove the argument of STE_Instance and ID_OldSyntax */ SwitchPreprocessor preprocessor no_preprocessor :== preprocessor diff --git a/frontend/compilerSwitches.icl b/frontend/compilerSwitches.icl index 02d3f3e..09ac960 100644 --- a/frontend/compilerSwitches.icl +++ b/frontend/compilerSwitches.icl @@ -2,7 +2,7 @@ implementation module compilerSwitches PA_BUG on off :== off -switch_import_syntax one_point_three two_point_zero :== one_point_three +switch_import_syntax one_point_three two_point_zero :== two_point_zero /* when finally removing this switch also remove the argument of STE_Instance and ID_OldSyntax */ SwitchPreprocessor preprocessor no_preprocessor :== preprocessor diff --git a/frontend/containers.dcl b/frontend/containers.dcl index abb6752..e788c86 100644 --- a/frontend/containers.dcl +++ b/frontend/containers.dcl @@ -1,7 +1,13 @@ definition module containers +/*2.0 +from syntax import ::Optional +from StdOverloaded import class toString +0.2*/ +//1.3 from syntax import Optional from StdOverloaded import toString +//3.1 :: NumberSet = Numbers !Int !NumberSet | EndNumbers diff --git a/frontend/convertDynamics.icl b/frontend/convertDynamics.icl index 11bd7e8..23be72a 100644 --- a/frontend/convertDynamics.icl +++ b/frontend/convertDynamics.icl @@ -15,7 +15,7 @@ import type_io; //import RWSDebug; /*2.0 -from type_io_common import toString; +from type_io_common import class toString (..),instance toString GlobalTCType; 0.2*/ :: *ConversionInfo = diff --git a/frontend/frontend.dcl b/frontend/frontend.dcl index 4b23a06..86aa0e3 100644 --- a/frontend/frontend.dcl +++ b/frontend/frontend.dcl @@ -3,8 +3,14 @@ */ definition module frontend +/*2.0 +from scanner import ::SearchPaths +from general import ::Optional, Yes, No +0.2*/ +//1.3 from scanner import SearchPaths from general import Optional, Yes, No +//3.1 import checksupport, transform, overloading :: FrontEndOptions diff --git a/frontend/general.dcl b/frontend/general.dcl index 9739a5b..268d9fa 100644 --- a/frontend/general.dcl +++ b/frontend/general.dcl @@ -1,6 +1,11 @@ definition module general +/*2.0 +from StdEnv import instance <<< Int,class <<< (..),instance + Int,class + (..),instance ~ Int,class ~ (..) +0.2*/ +//1.3 from StdEnv import <<<, +, ~ +//3.1 instance ~ Bool diff --git a/frontend/generics.dcl b/frontend/generics.dcl index c5dd159..857b9fd 100644 --- a/frontend/generics.dcl +++ b/frontend/generics.dcl @@ -1,7 +1,12 @@ definition module generics import checksupport +/*2.0 +from transform import ::Group +0.2*/ +//1.3 from transform import Group +//3.1 convertGenerics :: !{!Group} !Int !{#CommonDefs} !*{# FunDef} !*TypeDefInfos !*Heaps !*HashTable !*PredefinedSymbols !u:{# DclModule} /*!(Optional {#Index})*/ !*ErrorAdmin -> (!{!Group}, !{#CommonDefs}, !*{# FunDef}, !IndexRange, !*TypeDefInfos, !*Heaps, !*HashTable, !*PredefinedSymbols, !u:{# DclModule}, /*!(Optional {#Index}),*/ !*ErrorAdmin) diff --git a/frontend/generics.icl b/frontend/generics.icl index da4d70f..1386f08 100644 --- a/frontend/generics.icl +++ b/frontend/generics.icl @@ -6,8 +6,13 @@ import hashtable import checksupport import checktypes import check -from transform import Group import analtypes +/*2.0 +from transform import ::Group +0.2*/ +//1.3 +from transform import Group +//3.1 // whether to generate CONS // (needed for function that use CONS, like toString) diff --git a/frontend/typesupport.dcl b/frontend/typesupport.dcl index 895d6e7..9509ac6 100644 --- a/frontend/typesupport.dcl +++ b/frontend/typesupport.dcl @@ -2,7 +2,12 @@ definition module typesupport import checksupport, StdCompare +/*2.0 +from unitype import ::Coercions, ::CoercionTree, ::AttributePartition, CT_Empty +0.2*/ +//1.3 from unitype import Coercions, CoercionTree, AttributePartition, CT_Empty +//3.1 errorHeading :: !String !*ErrorAdmin -> *ErrorAdmin diff --git a/frontend/utilities.dcl b/frontend/utilities.dcl index 965f872..8df39e2 100644 --- a/frontend/utilities.dcl +++ b/frontend/utilities.dcl @@ -1,7 +1,13 @@ definition module utilities // compile with "reuse unique nodes" +/*2.0 +from StdEnv import class Eq, not, class Ord, class IncDec +0.2*/ +//1.3 from StdEnv import Eq, not, Ord, IncDec +//3.1 + import StdMisc, general import _aconcat diff --git a/main/Windows/CoclSystemDependent.dcl b/main/Windows/CoclSystemDependent.dcl index 10d2d1a..bdcddb1 100644 --- a/main/Windows/CoclSystemDependent.dcl +++ b/main/Windows/CoclSystemDependent.dcl @@ -3,8 +3,11 @@ definition module CoclSystemDependent //1.3 from StdString import String -//3.1 from StdFile import Files +//3.1 +/*2.0 +from StdFile import ::Files +0.2*/ // RWS split // from deltaIOSystem import DeviceSystem diff --git a/main/compile.dcl b/main/compile.dcl index a26b3a9..83ffb37 100644 --- a/main/compile.dcl +++ b/main/compile.dcl @@ -3,7 +3,12 @@ */ definition module compile +/*2.0 +from StdFile import ::Files +0.2*/ +//1.3 from StdFile import Files +//3.1 import checksupport compile :: ![{#Char}] !*DclCache !*Files -> (!Bool,!*DclCache,!*Files) @@ -17,4 +22,3 @@ compile :: ![{#Char}] !*DclCache !*Files -> (!Bool,!*DclCache,!*Files) }; empty_cache :: *SymbolTable -> *DclCache - diff --git a/main/filesystem.dcl b/main/filesystem.dcl index 5100e70..3b29e8a 100644 --- a/main/filesystem.dcl +++ b/main/filesystem.dcl @@ -7,7 +7,12 @@ */ definition module filesystem +/*2.0 +from StdFile import class FileSystem,::Files +0.2*/ +//1.3 from StdFile import FileSystem, Files +//3.1 // return last modified time (local time) as "yyyymmddhhmmss" or "" on error fmodificationtime :: {#Char} !*env -> (!{#Char}, !*env) | FileSystem env |