Started work on hauswirth hw09
This commit is contained in:
parent
4dd2cdfaad
commit
2d9362f7b7
13 changed files with 318 additions and 0 deletions
2
hw09/.gitignore
vendored
Normal file
2
hw09/.gitignore
vendored
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
.stack-work/
|
||||||
|
*~
|
3
hw09/ChangeLog.md
Normal file
3
hw09/ChangeLog.md
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
# Changelog for hw09
|
||||||
|
|
||||||
|
## Unreleased changes
|
30
hw09/LICENSE
Normal file
30
hw09/LICENSE
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
Copyright Author name here (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 Author name here 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.
|
1
hw09/README.md
Normal file
1
hw09/README.md
Normal file
|
@ -0,0 +1 @@
|
||||||
|
# hw09
|
2
hw09/Setup.hs
Normal file
2
hw09/Setup.hs
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
import Distribution.Simple
|
||||||
|
main = defaultMain
|
6
hw09/app/Main.hs
Normal file
6
hw09/app/Main.hs
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
module Main where
|
||||||
|
|
||||||
|
import Lib
|
||||||
|
|
||||||
|
main :: IO ()
|
||||||
|
main = someFunc
|
66
hw09/hw09.cabal
Normal file
66
hw09/hw09.cabal
Normal file
|
@ -0,0 +1,66 @@
|
||||||
|
cabal-version: 1.12
|
||||||
|
|
||||||
|
-- This file has been generated from package.yaml by hpack version 0.33.0.
|
||||||
|
--
|
||||||
|
-- see: https://github.com/sol/hpack
|
||||||
|
--
|
||||||
|
-- hash: 1c6863276828ebb115e333a5efb87447315a7c7d6871b21ef1a5b25f9b9e7e47
|
||||||
|
|
||||||
|
name: hw09
|
||||||
|
version: 0.1.0.0
|
||||||
|
description: Please see the README on GitHub at <https://github.com/githubuser/hw09#readme>
|
||||||
|
homepage: https://github.com/githubuser/hw09#readme
|
||||||
|
bug-reports: https://github.com/githubuser/hw09/issues
|
||||||
|
author: Author name here
|
||||||
|
maintainer: example@example.com
|
||||||
|
copyright: 2020 Author name here
|
||||||
|
license: BSD3
|
||||||
|
license-file: LICENSE
|
||||||
|
build-type: Simple
|
||||||
|
extra-source-files:
|
||||||
|
README.md
|
||||||
|
ChangeLog.md
|
||||||
|
|
||||||
|
source-repository head
|
||||||
|
type: git
|
||||||
|
location: https://github.com/githubuser/hw09
|
||||||
|
|
||||||
|
library
|
||||||
|
exposed-modules:
|
||||||
|
AST
|
||||||
|
Parser
|
||||||
|
other-modules:
|
||||||
|
Paths_hw09
|
||||||
|
hs-source-dirs:
|
||||||
|
src
|
||||||
|
build-depends:
|
||||||
|
base >=4.7 && <5
|
||||||
|
, regex-tdfa
|
||||||
|
default-language: Haskell2010
|
||||||
|
|
||||||
|
executable hw09-exe
|
||||||
|
main-is: Main.hs
|
||||||
|
other-modules:
|
||||||
|
Paths_hw09
|
||||||
|
hs-source-dirs:
|
||||||
|
app
|
||||||
|
ghc-options: -threaded -rtsopts -with-rtsopts=-N
|
||||||
|
build-depends:
|
||||||
|
base >=4.7 && <5
|
||||||
|
, hw09
|
||||||
|
, regex-tdfa
|
||||||
|
default-language: Haskell2010
|
||||||
|
|
||||||
|
test-suite hw09-test
|
||||||
|
type: exitcode-stdio-1.0
|
||||||
|
main-is: Spec.hs
|
||||||
|
other-modules:
|
||||||
|
Paths_hw09
|
||||||
|
hs-source-dirs:
|
||||||
|
test
|
||||||
|
ghc-options: -threaded -rtsopts -with-rtsopts=-N
|
||||||
|
build-depends:
|
||||||
|
base >=4.7 && <5
|
||||||
|
, hw09
|
||||||
|
, regex-tdfa
|
||||||
|
default-language: Haskell2010
|
49
hw09/package.yaml
Normal file
49
hw09/package.yaml
Normal file
|
@ -0,0 +1,49 @@
|
||||||
|
name: hw09
|
||||||
|
version: 0.1.0.0
|
||||||
|
github: "githubuser/hw09"
|
||||||
|
license: BSD3
|
||||||
|
author: "Author name here"
|
||||||
|
maintainer: "example@example.com"
|
||||||
|
copyright: "2020 Author name here"
|
||||||
|
|
||||||
|
extra-source-files:
|
||||||
|
- README.md
|
||||||
|
- ChangeLog.md
|
||||||
|
|
||||||
|
# Metadata used when publishing your package
|
||||||
|
# synopsis: Short description of your package
|
||||||
|
# category: Web
|
||||||
|
|
||||||
|
# To avoid duplicated efforts in documentation and dealing with the
|
||||||
|
# complications of embedding Haddock markup inside cabal files, it is
|
||||||
|
# common to point users to the README.md file.
|
||||||
|
description: Please see the README on GitHub at <https://github.com/githubuser/hw09#readme>
|
||||||
|
|
||||||
|
dependencies:
|
||||||
|
- base >= 4.7 && < 5
|
||||||
|
- regex-tdfa
|
||||||
|
|
||||||
|
library:
|
||||||
|
source-dirs: src
|
||||||
|
|
||||||
|
executables:
|
||||||
|
hw09-exe:
|
||||||
|
main: Main.hs
|
||||||
|
source-dirs: app
|
||||||
|
ghc-options:
|
||||||
|
- -threaded
|
||||||
|
- -rtsopts
|
||||||
|
- -with-rtsopts=-N
|
||||||
|
dependencies:
|
||||||
|
- hw09
|
||||||
|
|
||||||
|
tests:
|
||||||
|
hw09-test:
|
||||||
|
main: Spec.hs
|
||||||
|
source-dirs: test
|
||||||
|
ghc-options:
|
||||||
|
- -threaded
|
||||||
|
- -rtsopts
|
||||||
|
- -with-rtsopts=-N
|
||||||
|
dependencies:
|
||||||
|
- hw09
|
10
hw09/src/AST.hs
Normal file
10
hw09/src/AST.hs
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
module AST where
|
||||||
|
|
||||||
|
-- A variable in a function, like 'x' or 'y'
|
||||||
|
newtype Variable = Var String
|
||||||
|
|
||||||
|
-- The instructions in out IJVM AST
|
||||||
|
data Instruction = IADD | ISUB | IMUL | IDIV | IEXP | INEG | BIPUSH Int | ILOAD Variable
|
||||||
|
|
||||||
|
-- The program is just a list of instructions
|
||||||
|
type Program = [Instruction]
|
69
hw09/src/Parser.hs
Normal file
69
hw09/src/Parser.hs
Normal file
|
@ -0,0 +1,69 @@
|
||||||
|
-- vim: set ts=2 sw=2 et tw=80:
|
||||||
|
|
||||||
|
module Parser where
|
||||||
|
|
||||||
|
import Data.List
|
||||||
|
import Text.Regex.TDFA
|
||||||
|
|
||||||
|
-- Types of tokens (sequences of characters with a meaning, e.g. '(')
|
||||||
|
data TokenType = Exp | Plus | Minus | Star | Slash
|
||||||
|
| Percent | OpenParen | CloseParen | EOF
|
||||||
|
|
||||||
|
-- A token has a type its string contents
|
||||||
|
data Token = Symbol TokenType | Literal String | Identifier String
|
||||||
|
|
||||||
|
-- Represents a newly scanned token and the remaining string to parse
|
||||||
|
type ScanState = (Token, String)
|
||||||
|
|
||||||
|
-- Returns the string representation of the token type
|
||||||
|
tokenText :: TokenType -> String
|
||||||
|
tokenText Exp = "%"
|
||||||
|
tokenText Plus = "+"
|
||||||
|
tokenText Minus = "-"
|
||||||
|
tokenText Star = "*"
|
||||||
|
tokenText Slash = "/"
|
||||||
|
tokenText Percent = "%"
|
||||||
|
tokenText OpenParen = "("
|
||||||
|
tokenText CloseParen = ")"
|
||||||
|
|
||||||
|
-- If the token is found at the start of the string, returns Just of the token
|
||||||
|
-- and the remaining string, otherwise returns Nothing
|
||||||
|
findTokenText :: TokenType -> String -> Maybe ScanState
|
||||||
|
findTokenText EOF [] = Just (Symbol EOF, [])
|
||||||
|
findTokenText _ [] = Nothing
|
||||||
|
findTokenText tt s = if matches then Just (Symbol tt, rest) else Nothing
|
||||||
|
where text = tokenText tt
|
||||||
|
matches = text `isPrefixOf` s
|
||||||
|
rest = drop (length text) s
|
||||||
|
|
||||||
|
matchesRegex :: (String -> Token) -> String -> String -> Maybe ScanState
|
||||||
|
matchesRegex tokenConstr r s = case match of
|
||||||
|
[] -> Nothing
|
||||||
|
s -> Just (tokenConstr match, rest)
|
||||||
|
where match = s =~ r :: String
|
||||||
|
rest = drop (length match) s
|
||||||
|
|
||||||
|
matchesIdentifier :: String -> Maybe ScanState
|
||||||
|
matchesIdentifier = matchesRegex Identifier "[a-zA-Z][0-9a-zA-Z]+"
|
||||||
|
|
||||||
|
matchesLiteral :: String -> Maybe ScanState
|
||||||
|
matchesLiteral = matchesRegex Literal "[0-9]+"
|
||||||
|
|
||||||
|
tokenFactories :: [String -> Maybe ScanState]
|
||||||
|
tokenFactories = [
|
||||||
|
matchesIdentifier,
|
||||||
|
matchesLiteral,
|
||||||
|
findTokenText Plus,
|
||||||
|
findTokenText Exp,
|
||||||
|
findTokenText Minus,
|
||||||
|
findTokenText Star,
|
||||||
|
findTokenText Slash,
|
||||||
|
findTokenText Percent,
|
||||||
|
findTokenText OpenParen,
|
||||||
|
findTokenText CloseParen]
|
||||||
|
|
||||||
|
scanToken :: String -> [Maybe ScanState]
|
||||||
|
scanToken s = fmap ($s) tokenFactories
|
||||||
|
|
||||||
|
-- TODO: make ScanState a monoid and implement <> as picking the token
|
||||||
|
-- with minimum length
|
66
hw09/stack.yaml
Normal file
66
hw09/stack.yaml
Normal file
|
@ -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-16.3
|
||||||
|
|
||||||
|
# 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.3"
|
||||||
|
#
|
||||||
|
# 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
|
12
hw09/stack.yaml.lock
Normal file
12
hw09/stack.yaml.lock
Normal file
|
@ -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: 531696
|
||||||
|
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/3.yaml
|
||||||
|
sha256: 65e3a94c65ad07fa1913649e3f1e36c4af51bf528a5d9fd217bdc1b46d0477cc
|
||||||
|
original: lts-16.3
|
2
hw09/test/Spec.hs
Normal file
2
hw09/test/Spec.hs
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
main :: IO ()
|
||||||
|
main = putStrLn "Test suite not yet implemented"
|
Reference in a new issue