minor stuff

diff --git a/Makefile b/Makefile
index fe345b456c3c7f00c512d080884fbaf66a810a24..5a3fb4ec64d64efa86cad1a20a15e5ea6e024677 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,20 @@
-all:
-       happy -gca -idebug Parsyntax.y
-       alex -g Lexsyntax.x
+all: Docsyntax.dvi Testsyntax Typechecker
+
+Docsyntax.dvi: Docsyntax.tex

        latex Docsyntax.tex; dvips Docsyntax.dvi -o Docsyntax.ps
        latex Docsyntax.tex; dvips Docsyntax.dvi -o Docsyntax.ps

+
+Testsyntax: Testsyntax.hs  Parsyntax.hs Lexsyntax.hs Abssyntax.hs

        ghc --make Testsyntax.hs -o Testsyntax
        ghc --make Testsyntax.hs -o Testsyntax

+
+Typechecker: Typechecker.hs  Typecheck.hs Parsyntax.hs Lexsyntax.hs Abssyntax.hs

        ghc -fglasgow-exts --make Typechecker.hs -o Typechecker
        ghc -fglasgow-exts --make Typechecker.hs -o Typechecker

+
+Parsyntax.hs: Parsyntax.y
+       happy -gca -idebug Parsyntax.y
+
+Lexsyntax.hs: Lexsyntax.x
+       alex -g Lexsyntax.x
+

 clean:
        -rm -f *.log *.aux *.hi *.o *.dvi
        -rm -f Docsyntax.ps
 clean:
        -rm -f *.log *.aux *.hi *.o *.dvi
        -rm -f Docsyntax.ps

diff --git a/Typecheck.hs b/Typecheck.hs
index 2414203d7d81441d89080f3c3dc8d5486f140600..38ee8fe070973d51b4602dc6a39e90c928c9fcce 100644 (file)
--- a/Typecheck.hs
+++ b/Typecheck.hs
@@ -5,7 +5,6 @@ import Control.Monad.State
 import Data.Map as Map
 import Prelude hiding (lookup)
 
 import Data.Map as Map
 import Prelude hiding (lookup)
 

-

 type Types = Map Ident Type
 
 inList :: Eq a => a -> [a] -> Bool
 type Types = Map Ident Type
 
 inList :: Eq a => a -> [a] -> Bool


@@ -42,7 +41,6 @@ typeCheckExp (ENeg e) = do
        TInt <- typeCheckExp e
        return TInt
 
        TInt <- typeCheckExp e
        return TInt
 

-

 typeCheckVar :: (MonadState Types m) => Ident -> m Type 
 typeCheckVar i = do
        e <- get
 typeCheckVar :: (MonadState Types m) => Ident -> m Type 
 typeCheckVar i = do
        e <- get


@@ -77,4 +75,3 @@ typeCheckStm (SDecl t i e) = do
 typeCheckStm (SPrint e) = do
        typeCheckExp e
        return NoType
 typeCheckStm (SPrint e) = do
        typeCheckExp e
        return NoType

-

diff --git a/Typechecker.hs b/Typechecker.hs
index fb6986c317591f0b732b6cb8283c8b132cb768e9..2e205b7d0d516554e7d6909e9bbcf31d066898ee 100644 (file)
--- a/Typechecker.hs
+++ b/Typechecker.hs
@@ -15,9 +15,6 @@ import Typecheck
 import Control.Monad.State
 import Data.Map as Map hiding (showTree)
 
 import Control.Monad.State
 import Data.Map as Map hiding (showTree)
 

-
-
-

 import ErrM
 
 type ParseFun a = [Token] -> Err a
 import ErrM
 
 type ParseFun a = [Token] -> Err a