diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | ChangeLog.md | 3 | ||||
| -rw-r--r-- | LICENSE | 30 | ||||
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | Setup.hs | 2 | ||||
| -rw-r--r-- | app/Main.hs | 6 | ||||
| -rw-r--r-- | doc/lista8.pdf | bin | 0 -> 104800 bytes | |||
| -rw-r--r-- | doc/lista9.pdf | bin | 0 -> 114947 bytes | |||
| -rw-r--r-- | doc/pracownia.pdf | bin | 0 -> 106722 bytes | |||
| -rw-r--r-- | src/Lib.hs | 6 | ||||
| -rw-r--r-- | src/Syntax.hs | 34 | ||||
| -rw-r--r-- | src/Typecheck.hs | 43 | ||||
| -rw-r--r-- | stack.yaml | 66 | ||||
| -rw-r--r-- | stack.yaml.lock | 12 | ||||
| -rw-r--r-- | test/Spec.hs | 6 | ||||
| -rw-r--r-- | test/TypecheckTest.hs | 14 |
16 files changed, 226 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cd2150a --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.stack-work/ +wpp.cabal +*~
\ No newline at end of file diff --git a/ChangeLog.md b/ChangeLog.md new file mode 100644 index 0000000..cf75162 --- /dev/null +++ b/ChangeLog.md @@ -0,0 +1,3 @@ +# Changelog for wpp + +## Unreleased changes @@ -0,0 +1,30 @@ +Copyright Paweł Dybiec (c) 2020 + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Paweł Dybiec nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..f83bdde --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# wpp diff --git a/Setup.hs b/Setup.hs new file mode 100644 index 0000000..9a994af --- /dev/null +++ b/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/app/Main.hs b/app/Main.hs new file mode 100644 index 0000000..de1c1ab --- /dev/null +++ b/app/Main.hs @@ -0,0 +1,6 @@ +module Main where + +import Lib + +main :: IO () +main = someFunc diff --git a/doc/lista8.pdf b/doc/lista8.pdf Binary files differnew file mode 100644 index 0000000..653d694 --- /dev/null +++ b/doc/lista8.pdf diff --git a/doc/lista9.pdf b/doc/lista9.pdf Binary files differnew file mode 100644 index 0000000..8725a13 --- /dev/null +++ b/doc/lista9.pdf diff --git a/doc/pracownia.pdf b/doc/pracownia.pdf Binary files differnew file mode 100644 index 0000000..b6dfd33 --- /dev/null +++ b/doc/pracownia.pdf diff --git a/src/Lib.hs b/src/Lib.hs new file mode 100644 index 0000000..d36ff27 --- /dev/null +++ b/src/Lib.hs @@ -0,0 +1,6 @@ +module Lib + ( someFunc + ) where + +someFunc :: IO () +someFunc = putStrLn "someFunc" diff --git a/src/Syntax.hs b/src/Syntax.hs new file mode 100644 index 0000000..1c888b5 --- /dev/null +++ b/src/Syntax.hs @@ -0,0 +1,34 @@ +module Syntax + where + +type Idnt = String +data Typ = TInt + | TRecord [(Idnt, Typ)] + | TVariant [(Idnt, Typ)] + | TPtr Typ + deriving(Eq,Show) + +data Expr = Var Idnt + | IntLit Int + | Record [(Idnt, Expr)] + | Variant Typ [(Idnt, Expr)] + | Add Expr Expr + | Mult Expr Expr + | Neg Expr + | Deref Expr + deriving(Eq,Show) +data Com = Skip + | Seq Com Com + | If Expr Com Com + | While Expr Com + | Asgn Idnt Expr + | Decl Idnt Expr Com + | Alloc Idnt Expr + | Save Idnt Expr + deriving(Eq,Show) + +data FuncDecl = Func Idnt [Idnt] [(Idnt,Expr)] Com Expr + deriving(Eq,Show) +data Program = P [FuncDecl] [(Idnt, Int)] Com + deriving(Eq,Show) + diff --git a/src/Typecheck.hs b/src/Typecheck.hs new file mode 100644 index 0000000..d8b8128 --- /dev/null +++ b/src/Typecheck.hs @@ -0,0 +1,43 @@ +module Typecheck +(inferExpr, + checkExpr) + where +import Syntax +import Control.Monad +type Environment = [(Idnt,Typ)] + +assertInt TInt = Just () +assertInt _ = Nothing +assertRec (Record _) = Just () +assertRec _ = Nothing +assertVar (Variant _ _) = Just () +assertVar _ = Nothing +assertPtr (TPtr _) = Just () +assertPtr _ = Nothing + +inferExpr :: Expr -> Environment -> Maybe Typ +inferExpr (Var name) env = lookup name env +inferExpr (IntLit _) _ = Just TInt +inferExpr (Record _) _ = undefined +inferExpr (Variant _ _) _ = undefined +inferExpr (Add e1 e2) env = do + checkExpr e1 env TInt + checkExpr e1 env TInt + return TInt +inferExpr (Mult e1 e2) env = do + checkExpr e1 env TInt + checkExpr e1 env TInt + return TInt +inferExpr (Neg e) env = do + checkExpr e env TInt + return TInt +inferExpr (Deref e1) env = do + t <- inferExpr e1 env + assertPtr t + return t + +checkExpr :: Expr -> Environment -> Typ -> Maybe () +checkExpr e env t = do + t' <- inferExpr e env + guard (t==t') + return () diff --git a/stack.yaml b/stack.yaml new file mode 100644 index 0000000..6ff00bd --- /dev/null +++ b/stack.yaml @@ -0,0 +1,66 @@ +# This file was automatically generated by 'stack init' +# +# Some commonly used options have been documented as comments in this file. +# For advanced use and comprehensive documentation of the format, please see: +# https://docs.haskellstack.org/en/stable/yaml_configuration/ + +# Resolver to choose a 'specific' stackage snapshot or a compiler version. +# A snapshot resolver dictates the compiler version and the set of packages +# to be used for project dependencies. For example: +# +# resolver: lts-3.5 +# resolver: nightly-2015-09-21 +# resolver: ghc-7.10.2 +# +# The location of a snapshot can be provided as a file or url. Stack assumes +# a snapshot provided as a file might change, whereas a url resource does not. +# +# resolver: ./custom-snapshot.yaml +# resolver: https://example.com/snapshots/2018-01-01.yaml +resolver: lts-14.20 + +# User packages to be built. +# Various formats can be used as shown in the example below. +# +# packages: +# - some-directory +# - https://example.com/foo/bar/baz-0.0.2.tar.gz +# subdirs: +# - auto-update +# - wai +packages: +- . +# Dependency packages to be pulled from upstream that are not in the resolver. +# These entries can reference officially published versions as well as +# forks / in-progress versions pinned to a git hash. For example: +# +# extra-deps: +# - acme-missiles-0.3 +# - git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# +# extra-deps: [] + +# Override default flag values for local packages and extra-deps +# flags: {} + +# Extra package databases containing global packages +# extra-package-dbs: [] + +# Control whether we use the GHC we find on the path +# system-ghc: true +# +# Require a specific version of stack, using version ranges +# require-stack-version: -any # Default +# require-stack-version: ">=2.1" +# +# Override the architecture used by stack, especially useful on Windows +# arch: i386 +# arch: x86_64 +# +# Extra directories used by stack for building +# extra-include-dirs: [/path/to/dir] +# extra-lib-dirs: [/path/to/dir] +# +# Allow a newer minor version of GHC than the snapshot specifies +# compiler-check: newer-minor diff --git a/stack.yaml.lock b/stack.yaml.lock new file mode 100644 index 0000000..00435e5 --- /dev/null +++ b/stack.yaml.lock @@ -0,0 +1,12 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: [] +snapshots: +- completed: + size: 524154 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/20.yaml + sha256: 2f5099f69ddb6abfe64400fe1e6a604e8e628f55e6837211cd70a81eb0a8fa4d + original: lts-14.20 diff --git a/test/Spec.hs b/test/Spec.hs new file mode 100644 index 0000000..4e3f0c1 --- /dev/null +++ b/test/Spec.hs @@ -0,0 +1,6 @@ +import Test.Hspec +import TypecheckTest +main :: IO () +main = hspec $ do + typecheckTest + diff --git a/test/TypecheckTest.hs b/test/TypecheckTest.hs new file mode 100644 index 0000000..b08574a --- /dev/null +++ b/test/TypecheckTest.hs @@ -0,0 +1,14 @@ +module TypecheckTest + where +import Typecheck +import Syntax +import Test.Hspec +typecheckTest :: Spec +typecheckTest = describe "inferExpr" $ do + it "can infer variables" $ do + inferExpr (Var "a") [("a", TInt)] `shouldBe` Just TInt + inferExpr (Var "a") [("a", TRecord [("b",TInt)])] `shouldBe` (Just $ TRecord [("b",TInt)]) + inferExpr (Var "a") [("a", TVariant [("b",TInt)])] `shouldBe` (Just $ TVariant[("b",TInt)]) + inferExpr (Var "a") [("a", TPtr TInt)] `shouldBe` ( Just $ TPtr TInt ) + it "shouldn't infer undefined variables" $ do + inferExpr (Var "a") [] `shouldBe` Nothing |