diff options
| -rw-r--r-- | assignment-13/uFPL.dcl (renamed from assignment-13/ufpl.dcl) | 4 | ||||
| -rw-r--r-- | assignment-13/uFPL.icl (renamed from assignment-13/ufpl.icl) | 10 | ||||
| -rw-r--r-- | assignment-13/uFPL/Arduino.dcl (renamed from assignment-13/Arduino.dcl) | 4 | ||||
| -rw-r--r-- | assignment-13/uFPL/Arduino.icl (renamed from assignment-13/Arduino.icl) | 4 | ||||
| -rw-r--r-- | assignment-13/uFPL/Bootstrap.dcl (renamed from assignment-13/Bootstrap.dcl) | 4 | ||||
| -rw-r--r-- | assignment-13/uFPL/Bootstrap.icl (renamed from assignment-13/Bootstrap.icl) | 8 | ||||
| -rw-r--r-- | assignment-13/uFPL/C.dcl (renamed from assignment-13/C.dcl) | 6 | ||||
| -rw-r--r-- | assignment-13/uFPL/C.icl (renamed from assignment-13/C.icl) | 6 | ||||
| -rw-r--r-- | assignment-13/uFPL/Util.dcl (renamed from assignment-13/Util.dcl) | 2 | ||||
| -rw-r--r-- | assignment-13/uFPL/Util.icl (renamed from assignment-13/Util.icl) | 2 |
10 files changed, 25 insertions, 25 deletions
diff --git a/assignment-13/ufpl.dcl b/assignment-13/uFPL.dcl index 9f1036f..1bd3df4 100644 --- a/assignment-13/ufpl.dcl +++ b/assignment-13/uFPL.dcl @@ -1,9 +1,9 @@ -definition module ufpl +definition module uFPL from StdGeneric import :: Bimap from StdOverloaded import class +, class -, class *, class /, class ==, class < -from C import :: CType, :: CExpr, :: CBody, :: CVar, :: CFun, :: CProg +from uFPL.C import :: CType, :: CExpr, :: CBody, :: CVar, :: CFun, :: CProg :: RO = RO :: RW = RW diff --git a/assignment-13/ufpl.icl b/assignment-13/uFPL.icl index bfd8a8a..2499da5 100644 --- a/assignment-13/ufpl.icl +++ b/assignment-13/uFPL.icl @@ -1,4 +1,4 @@ -implementation module ufpl +implementation module uFPL import StdArray import StdBool @@ -15,10 +15,10 @@ import StdTuple from Data.Func import $ import Data.List -import Arduino -import Bootstrap -import C -import Util +import uFPL.Arduino +import uFPL.Bootstrap +import uFPL.C +import uFPL.Util typedfun :: CType String -> String typedfun t f = flip (+++) f case t of diff --git a/assignment-13/Arduino.dcl b/assignment-13/uFPL/Arduino.dcl index abb4888..efed603 100644 --- a/assignment-13/Arduino.dcl +++ b/assignment-13/uFPL/Arduino.dcl @@ -1,8 +1,8 @@ -definition module Arduino +definition module uFPL.Arduino from StdOverloaded import class toString -from Util import class print +from uFPL.Util import class print :: Button = B0 | B1 | B2 | B3 | B4 | B5 diff --git a/assignment-13/Arduino.icl b/assignment-13/uFPL/Arduino.icl index fe108f4..2fbab30 100644 --- a/assignment-13/Arduino.icl +++ b/assignment-13/uFPL/Arduino.icl @@ -1,8 +1,8 @@ -implementation module Arduino +implementation module uFPL.Arduino import StdOverloaded -import Util +import uFPL.Util instance toString Button where diff --git a/assignment-13/Bootstrap.dcl b/assignment-13/uFPL/Bootstrap.dcl index eaf1521..201957c 100644 --- a/assignment-13/Bootstrap.dcl +++ b/assignment-13/uFPL/Bootstrap.dcl @@ -1,8 +1,8 @@ -definition module Bootstrap +definition module uFPL.Bootstrap from StdOverloaded import class zero -import ufpl +import uFPL rwBool :: String Bool -> Expr Bool RW roBool :: String Bool -> Expr Bool RO diff --git a/assignment-13/Bootstrap.icl b/assignment-13/uFPL/Bootstrap.icl index f603b18..8e00e97 100644 --- a/assignment-13/Bootstrap.icl +++ b/assignment-13/uFPL/Bootstrap.icl @@ -1,13 +1,13 @@ -implementation module Bootstrap +implementation module uFPL.Bootstrap from StdFunc import const import StdGeneric from StdMisc import undef import StdString -import Arduino -import C -import ufpl +import uFPL.Arduino +import uFPL.C +import uFPL rwBool :: String Bool -> Expr Bool RW rwBool n d = EShared {sname=n, stype=CTBool, sinit=d, srepr=boolmap} diff --git a/assignment-13/C.dcl b/assignment-13/uFPL/C.dcl index 40f93d0..f9d3595 100644 --- a/assignment-13/C.dcl +++ b/assignment-13/uFPL/C.dcl @@ -1,9 +1,9 @@ -definition module C +definition module uFPL.C from Data.Maybe import :: Maybe -from Arduino import :: Button -from Util import class print +from uFPL.Arduino import :: Button +from uFPL.Util import class print :: Signedness = Sig | Unsig diff --git a/assignment-13/C.icl b/assignment-13/uFPL/C.icl index b9b84f6..763774c 100644 --- a/assignment-13/C.icl +++ b/assignment-13/uFPL/C.icl @@ -1,4 +1,4 @@ -implementation module C +implementation module uFPL.C from StdFunc import id, o, twice import StdList @@ -12,8 +12,8 @@ import Data.List import Data.Maybe import Data.Tuple -import Arduino -import Util +import uFPL.Arduino +import uFPL.Util (`seq`) infix 0 :: CBody CBody -> CBody (`seq`) CBEmpty cb = cb diff --git a/assignment-13/Util.dcl b/assignment-13/uFPL/Util.dcl index 9e6ae0a..0370fc9 100644 --- a/assignment-13/Util.dcl +++ b/assignment-13/uFPL/Util.dcl @@ -1,4 +1,4 @@ -definition module Util +definition module uFPL.Util :: PrState = { indent :: Int diff --git a/assignment-13/Util.icl b/assignment-13/uFPL/Util.icl index 8c246c7..42f7c27 100644 --- a/assignment-13/Util.icl +++ b/assignment-13/uFPL/Util.icl @@ -1,4 +1,4 @@ -implementation module Util +implementation module uFPL.Util import StdClass from StdFunc import id, o |