aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Smeding <tom.smeding@gmail.com>2020-07-24 22:24:44 +0200
committerTom Smeding <tom.smeding@gmail.com>2020-07-24 22:24:44 +0200
commitd951a11b1141b9f4c1ee50c7f89b68c552883c16 (patch)
treea3097eab42081e5af45e516a3e3c8c956503bd57
parentea681150783d1feae265a045edefaeb0e10dd8c7 (diff)
Move CC.{Source,Typed} to CC.AST.*
-rw-r--r--ast/CC/AST/Source.hs (renamed from ast/CC/Source.hs)2
-rw-r--r--ast/CC/AST/Typed.hs (renamed from ast/CC/Typed.hs)4
-rw-r--r--compcomp.cabal2
-rw-r--r--parser/CC/Parser.hs2
-rw-r--r--typecheck/CC/Typecheck.hs4
5 files changed, 7 insertions, 7 deletions
diff --git a/ast/CC/Source.hs b/ast/CC/AST/Source.hs
index c10f910..3d7d5ea 100644
--- a/ast/CC/Source.hs
+++ b/ast/CC/AST/Source.hs
@@ -1,4 +1,4 @@
-module CC.Source(module CC.Source, module CC.Types) where
+module CC.AST.Source(module CC.AST.Source, module CC.Types) where
import Data.List
diff --git a/ast/CC/Typed.hs b/ast/CC/AST/Typed.hs
index 53caa29..f4c4d56 100644
--- a/ast/CC/Typed.hs
+++ b/ast/CC/AST/Typed.hs
@@ -1,5 +1,5 @@
-module CC.Typed(
- module CC.Typed,
+module CC.AST.Typed(
+ module CC.AST.Typed,
module CC.Types
) where
diff --git a/compcomp.cabal b/compcomp.cabal
index c849954..c7fec4e 100644
--- a/compcomp.cabal
+++ b/compcomp.cabal
@@ -33,7 +33,7 @@ library cc-ast
import: deps
hs-source-dirs: ast
build-depends: cc-utils
- exposed-modules: CC.Source, CC.Typed
+ exposed-modules: CC.AST.Source, CC.AST.Typed
library cc-utils
import: deps
diff --git a/parser/CC/Parser.hs b/parser/CC/Parser.hs
index a097f98..f8e482e 100644
--- a/parser/CC/Parser.hs
+++ b/parser/CC/Parser.hs
@@ -4,8 +4,8 @@ import Control.Monad
import Text.Parsec hiding (SourcePos, getPosition, token)
import qualified Text.Parsec
+import CC.AST.Source
import CC.Pretty
-import CC.Source
type Parser a = Parsec String () a
diff --git a/typecheck/CC/Typecheck.hs b/typecheck/CC/Typecheck.hs
index 455465a..195fc19 100644
--- a/typecheck/CC/Typecheck.hs
+++ b/typecheck/CC/Typecheck.hs
@@ -10,9 +10,9 @@ import Data.Maybe
import qualified Data.Set as Set
import Data.Set (Set)
+import CC.AST.Source
+import CC.AST.Typed
import CC.Pretty
-import CC.Source
-import CC.Typed
-- Inspiration: https://github.com/kritzcreek/fby19