Commit 57b17523 authored by Mart Lubbers's avatar Mart Lubbers
Browse files

adapt to new gentype namespace

parent f971b174
Pipeline #60955 failed with stage
in 1 minute and 2 seconds
......@@ -13,8 +13,8 @@ from iTasks.Internal.Generic.Visualization import generic gText, :: TextFormat
from Text.GenJSON import generic JSONDecode, generic JSONEncode, :: JSONNode
from Data.GenEq import generic gEq
from StdOverloaded import class zero, class one, class -, class +, class *, class /, class rem, class <, class toInt, class ~, class fromInt, class ^
from GenType import generic gType, :: Box, :: GType
from GenType.CSerialise import generic gCSerialise, generic gCDeserialise, :: Either, :: CDeserialiseError
from Data.GenType import generic gType, :: Box, :: GType
from Data.GenType.CSerialise import generic gCSerialise, generic gCDeserialise, :: Either, :: CDeserialiseError
//** Unsigned 32-bit integer
:: UInt32 =: UInt32 Int
......
......@@ -9,8 +9,8 @@ import StdEnv
import Text.GenJSON
import iTasks
import GenType
import GenType.CSerialise
import Data.GenType
import Data.GenType.CSerialise
instance ~ UInt8 where ~ (UInt8 a) = norm (UInt8 a)
instance ~ Int8 where ~ (Int8 a) = norm (Int8 (~ a))
......
......@@ -13,7 +13,7 @@ from Data.Functor import class Functor
from Data.GenCons import generic conses
from Data.GenDefault import generic gDefault
from Data.GenEq import generic gEq
from GenType.CSerialise import generic gCSerialise, generic gCDeserialise, :: CDeserialiseError
from Data.GenType.CSerialise import generic gCSerialise, generic gCDeserialise, :: CDeserialiseError
from StdOverloaded import class toString
from Text.GenJSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from iTasks.Internal.Generic.Visualization import generic gText, :: TextFormat
......
......@@ -23,7 +23,7 @@ import mTask.Interpret.String255
import mTask.Interpret.ByteCodeEncoding._FBC
import iTasks.WF.Definition
import GenType.CSerialise
import Data.GenType.CSerialise
import code from "convert_real_to_float_in_int.o"
......
......@@ -5,7 +5,7 @@ definition module mTask.Interpret.Compile
*/
from StdOverloaded import class zero
from GenType.CSerialise import generic gCSerialise, generic gCDeserialise, :: CDeserialiseError
from Data.GenType.CSerialise import generic gCSerialise, generic gCDeserialise, :: CDeserialiseError
from Data.Either import :: Either
from iTasks.WF.Definition import class iTask, :: TaskValue, :: Task
from iTasks.UI.Editor.Generic import generic gEditor, :: Editor, :: EditorPurpose, :: EditorReport
......
......@@ -14,7 +14,7 @@ import mTask.Interpret.String255
import mTask.Interpret.VoidPointer
import mTask.Interpret.Message
import mTask.Interpret.Instructions
import GenType.CSerialise
import Data.GenType.CSerialise
from iTasks.WF.Tasks.Core import return
from iTasks.WF.Tasks.SDS import get
......
......@@ -10,7 +10,7 @@ import System._Pointer
import Text
import mTask.Interpret.Device
import GenType.CSerialise
import Data.GenType.CSerialise
import iTasks.Extensions.MQTT
import iTasks.Extensions.MQTT.Client
......
......@@ -9,7 +9,7 @@ import Data.Either
import Data.Maybe
import mTask.Interpret.ByteCodeEncoding
import mTask.Interpret.Message
import GenType.CSerialise
import Data.GenType.CSerialise
instance channelSync TTYSettings where
channelSync settings channels
......
......@@ -6,7 +6,7 @@ import iTasks.SDS.Definition
import System.Time
import Text
import Data.Either
import GenType.CSerialise
import Data.GenType.CSerialise
import mTask.Interpret.Device
import mTask.Interpret.ByteCodeEncoding
import mTask.Interpret.Message
......
......@@ -23,7 +23,7 @@ from mTask.Interpret.String255 import :: String255
from mTask.Language.pinIO import :: PinMode
from mTask.Language.Interrupts import :: InterruptMode
from GenType.CSerialise import generic gCSerialise, generic gCDeserialise, :: CDeserialiseError
from Data.GenType.CSerialise import generic gCSerialise, generic gCDeserialise, :: CDeserialiseError
derive class iTask BCInstrs, BCInstr, BCTaskType, JumpLabel
......
......@@ -16,8 +16,8 @@ import iTasks => qualified return, forever, sequence
import mTask.Language
import mTask.Interpret.String255
import GenType
import GenType.CSerialise
import Data.GenType
import Data.GenType.CSerialise
derive class iTask BCInstrs, BCInstr, BCTaskType, JumpLabel
......@@ -36,8 +36,8 @@ gCDeserialise{|BCInstrs|} top = \st->
Left e = Left e
Right (cs, st) = case deserialiseMultiple listTop (tl [BCReturn1_0]) (map fromChar cs) of
Left e = Left e
Right (is, e) = Left (CDUser "Error parsing bytecode instructions, input not exhausted")
Right (is, []) = Right (BCIs {i\\i<-is}, st)
Right (is, e) = Left (CDUser "Error parsing bytecode instructions, input not exhausted")
bcinstrsgType :: (String, [String], String -> [String], String -> [String])
bcinstrsgType =
......
......@@ -5,7 +5,7 @@ definition module mTask.Interpret.Message
*/
from StdOverloaded import class toString
from GenType.CSerialise import generic gCSerialise, generic gCDeserialise, :: CDeserialiseError
from Data.GenType.CSerialise import generic gCSerialise, generic gCDeserialise, :: CDeserialiseError
from Data.Either import :: Either
from iTasks.WF.Definition import class iTask
from iTasks.UI.Editor.Generic import generic gEditor, :: Editor, :: EditorPurpose, :: EditorReport
......
......@@ -2,7 +2,7 @@ implementation module mTask.Interpret.Message
import StdEnv
import iTasks
import GenType.CSerialise
import Data.GenType.CSerialise
import Data.UInt
import mTask.Interpret => qualified :: MTask
import mTask.Interpret.Instructions
......
......@@ -8,7 +8,7 @@ definition module mTask.Interpret.Peripheral
from Data.UInt import :: UInt8
from StdOverloaded import class toString
from GenType.CSerialise import generic gCSerialise, generic gCDeserialise, :: CDeserialiseError
from Data.GenType.CSerialise import generic gCSerialise, generic gCDeserialise, :: CDeserialiseError
from Data.Either import :: Either
from iTasks.WF.Definition import class iTask
from iTasks.UI.Editor.Generic import generic gEditor, :: Editor, :: EditorPurpose, :: EditorReport
......
......@@ -21,7 +21,7 @@ import mTask.Interpret.VoidPointer
import Data.UInt
import mTask.Language
import GenType.CSerialise
import Data.GenType.CSerialise
derive class iTask BCPeripheral
derive gCSerialise BCPeripheral, DHTtype, DHTInfo, Pin, APin, DPin, LEDMatrixInfo, I2CAddr
......
......@@ -13,7 +13,7 @@ from Data.Either import :: Either
from Text.GenJSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from StdClass import class zero
from GenType.CSerialise import generic gCSerialise, generic gCDeserialise, :: CDeserialiseError
from Data.GenType.CSerialise import generic gCSerialise, generic gCDeserialise, :: CDeserialiseError
from mTask.Interpret.DSL import :: UInt8, :: UInt16
derive class iTask MTDeviceSpec
......
......@@ -7,7 +7,7 @@ import mTask.Interpret.ByteCodeEncoding
import mTask.Interpret.DSL
import mTask.Language
import GenType.CSerialise
import Data.GenType.CSerialise
derive class iTask MTDeviceSpec
......
......@@ -7,8 +7,8 @@ definition module mTask.Interpret.String255
from Data.Either import :: Either
from Data.GenDefault import generic gDefault
from Data.GenEq import generic gEq
from GenType import generic gType, :: Box, :: GType
from GenType.CSerialise import generic gCSerialise, generic gCDeserialise, :: CDeserialiseError
from Data.GenType import generic gType, :: Box, :: GType
from Data.GenType.CSerialise import generic gCSerialise, generic gCDeserialise, :: CDeserialiseError
from StdOverloaded import class +++, class %, class fromString, class ==
from Text import class Text
from Text.GenJSON import generic JSONEncode, generic JSONDecode, :: JSONNode
......
......@@ -6,8 +6,8 @@ import Control.GenBimap
import Data.Func
import Data.Either
import Data.UInt
import GenType
import GenType.CSerialise
import Data.GenType
import Data.GenType.CSerialise
import Text
import iTasks
......
......@@ -6,13 +6,12 @@ definition module mTask.Interpret.VoidPointer
from Data.Either import :: Either
from Data.GenEq import generic gEq
from GenType import generic gType, :: Box, :: GType
from Text.GenJSON import generic JSONEncode, generic JSONDecode, :: JSONNode
from iTasks.Internal.Generic.Visualization import generic gText, :: TextFormat
from iTasks.UI.Editor.Generic import generic gEditor, :: Editor, :: EditorPurpose, :: EditorReport
from iTasks.WF.Definition import class iTask
from GenType import generic gType, :: Box, :: GType
from GenType.CSerialise import generic gCSerialise, generic gCDeserialise, :: CDeserialiseError
from Data.GenType import generic gType, :: Box, :: GType
from Data.GenType.CSerialise import generic gCSerialise, generic gCDeserialise, :: CDeserialiseError
from Data.Either import :: Either
//** Datatype, it does not contain data, it only represents a void pointer in the generated C code
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment