rewrite generation to rws

[mTask.git] / mTaskSimulation.dcl

diff --git a/mTaskSimulation.dcl b/mTaskSimulation.dcl
index 16ceee4..ed86068 100644 (file)
--- a/mTaskSimulation.dcl
+++ b/mTaskSimulation.dcl
@@ -1,12 +1,11 @@
 definition module mTaskSimulation
 
-import iTasks.API.Core.Types
+from iTasks.API.Core.Types import class iTask, :: Task, generic gEditor, generic gText, generic JSONEncode, generic JSONDecode, generic gDefault, :: Editor, :: TextFormat, :: JSONNode
 import mTask
 
-//:: Display a = Display a
+:: Display a = Display a
 
-//derive class iTask Display
-//instance zero State`
+derive class iTask Display
 
 eval :: (Main (Eval t p)) -> [String] | toString t
 :: State` = 
@@ -112,6 +111,6 @@ class stringQuotes t | type t :: (Code t p) -> Code t p
 instance stringQuotes String
 instance stringQuotes t
 
-derive   toGenDynamic (), MTask, DigitalPin, AnalogPin, Pin, [], Long //, Servo
-derive fromGenDynamic (), MTask, DigitalPin, AnalogPin, Pin, [], Long //, Servo
+derive   toGenDynamic (), MTask, DigitalPin, AnalogPin, Pin, [], Long, UserLED //, Servo
+derive fromGenDynamic (), MTask, DigitalPin, AnalogPin, Pin, [], Long, UserLED //, Servo
 instance ==   ()