isolated Patterns, moved Positioned instances

Frege · Apr 9, 2014 · 5d15b70 · 5d15b70
1 parent defa224
commit 5d15b70
Show file tree

Hide file tree

Showing 16 changed files with 436 additions and 102 deletions.
diff --git a/frege/compiler/Data.fr b/frege/compiler/Data.fr
@@ -80,6 +80,7 @@ import  frege.compiler.types.ImportDetails
 import  frege.compiler.types.QNames
 import  frege.compiler.types.External
 import  frege.compiler.types.Types
+import  frege.compiler.types.Patterns
 
 --- compiler options
 data Options = !Options {
@@ -372,7 +373,6 @@ infixl 16 `App` `nApp`  `TApp`
 infixr 16 `TFun`
 
 
-
 --- The names of the java primitive types 
 primitiveTypes = ["byte", "short", "boolean", "char", "int", "long", "float", "double" ]
 
@@ -500,28 +500,6 @@ derive Eq CKind
 derive Enum CKind
 
 
-{--
- * patterns
- -}
-data PatternT q =
-      !PVar    { pos::Position, uid::Int, var::String }                     -- x
-    | PCon     { pos::Position, qname::q, pats :: [PatternT q] }            -- Con
-    | PConFS   { pos::Position, qname::q, fields::[(String, PatternT q)] }  -- Con { field, ... }
-    | !PAt     { pos::Position, uid::Int, var::String, pat::PatternT q}     -- a@pat
-    | !PUser   { pat :: PatternT q, lazy :: Bool}                           -- !pat or ?pat
-    | !PLit    { pos::Position, kind::Literalkind, value::String}           -- 42 #foo#
-    | !PAnn    { pat::PatternT q, typ::SigmaT q}                            -- pat::forall a.Eq a => a -> a
-    | !PMat    { pos::Position, uid::Int, var::String, value::String}
-
-
--- m~#foo#
-
-type PatternS = PatternT SName
-
-
-type Pattern  = PatternT QName
-
-
 {-- Convenience function for injecting an @a@ into ('StG').
     This is just 'StG.return' typed as @a -> State Global a@ -}
 stio :: a -> StG a

diff --git a/frege/compiler/Enter.fr b/frege/compiler/Enter.fr
@@ -58,6 +58,7 @@ import  Compiler.types.JTypes(rawName)
 import  Compiler.types.Packs
 import  Compiler.types.QNames
 import  Compiler.types.Types
+import  Compiler.types.Patterns
 
 import frege.compiler.Data
 import Lib.PP (text, msgdoc)

diff --git a/frege/compiler/Fixdefs.fr b/frege/compiler/Fixdefs.fr
@@ -23,6 +23,7 @@ import frege.compiler.Utilities   as U()
 import Compiler.enums.TokenID(VARID)
 
 import Compiler.types.SNames(Simple)
+import Compiler.types.Patterns
 
 {--
  *  Post condition for import pass

diff --git a/frege/compiler/GUtil.fr b/frege/compiler/GUtil.fr
@@ -65,6 +65,7 @@ import Compiler.types.Positions
 import Compiler.types.Tokens
 import Compiler.types.SNames
 import  Compiler.types.Types
+import  Compiler.types.Patterns
 
 
 data Program =  

diff --git a/frege/compiler/GenJava7.fr b/frege/compiler/GenJava7.fr
@@ -78,6 +78,7 @@ import  Compiler.types.JTypes
 import  Compiler.types.Packs
 import  Compiler.types.QNames
 import  Compiler.types.Types
+import  Compiler.types.Patterns
 
 import Compiler.common.Mangle
 import Compiler.common.Annotate

diff --git a/frege/compiler/GenMeta.fr b/frege/compiler/GenMeta.fr
@@ -64,6 +64,7 @@ import  Compiler.types.Packs
 import  Compiler.types.QNames
 import  Compiler.types.External
 import  Compiler.types.Types
+import  Compiler.types.Patterns
 
 
 import frege.compiler.Data

diff --git a/frege/compiler/Import.fr b/frege/compiler/Import.fr
@@ -62,6 +62,7 @@ import  Compiler.types.Packs
 import  Compiler.types.ImportDetails
 import  Compiler.types.QNames
 import  Compiler.types.Types
+import  Compiler.types.Patterns
 
 import frege.compiler.Classtools    as CT()
 import frege.compiler.Utilities     as U()

diff --git a/frege/compiler/Transdef.fr b/frege/compiler/Transdef.fr
@@ -56,6 +56,7 @@ import  Compiler.types.SNames
 import  Compiler.types.Packs
 import  Compiler.types.QNames
 import  Compiler.types.Types
+import  Compiler.types.Patterns
 
 import frege.compiler.Data
 import frege.compiler.Utilities     as U(resolveVName, resolveXName, transSigma, transTau,

diff --git a/frege/compiler/Transform.fr b/frege/compiler/Transform.fr
@@ -64,6 +64,7 @@ import  Compiler.types.Strictness
 import  Compiler.types.Packs
 import  Compiler.types.QNames
 import  Compiler.types.Types
+import  Compiler.types.Patterns
 
 import frege.compiler.Data
 import Lib.PP (msgdoc, text, </>)

diff --git a/frege/compiler/Typecheck.fr b/frege/compiler/Typecheck.fr
@@ -89,6 +89,7 @@ import  Compiler.types.Tokens
 import  Compiler.types.Packs
 import  Compiler.types.QNames
 import  Compiler.types.Types
+import  Compiler.types.Patterns as P
 
 import frege.compiler.Data
 import Lib.PP(text, msgdoc, nest, stack, <>, </>, <+/>, <+>)