Merge branch 'master' into typed-task-editor

.gitignore

 **/Clean System Files
 *-data
-*-sapl
 *-www
 *.prj
 *.prp
 *.exe
+*.bc
+*.pbc
 .sass-cache
 BasicAPIExamples.icl
 .ctest-results.json

.gitlab-ci.yml

 test:
-    before_script:
-        - install_clean.sh bundle-complete && install_clean_nightly.sh test && apt-get update -qq && apt-get install -y -qq build-essential libsqlite3-dev libmariadbclient-dev-compat
-    image: "camilstaps/clean:nightly"
-    script:
-        - bash ci-tests.bash
+  image: "camilstaps/clean:nightly"
+  before_script:
+    - install_clean.sh "bundle-complete abc-interpreter"
+    - install_clean_nightly.sh test
+    - apt-get update -qq
+    - apt-get install -y -qq build-essential libsqlite3-dev libmariadbclient-dev-compat
+  script:
+    - bash ci-tests.bash

Config/linux-x64/iTasks-dist.env

@@ -5,18 +5,23 @@ Version: 1.0
 			Path:	{Application}/lib/StdEnv
 			Path:	{Application}/lib/Dynamics
 			Path:	{Application}/lib/TCPIP
-			Path:	{Application}/lib/Sapl
+			Path:	{Application}/lib/ABCInterpreter
 			Path:	{Application}/lib/GraphCopy
 			Path:	{Application}/lib/Platform
 			Path:	{Application}/lib/Platform/Deprecated/Generics
 			Path:	{Application}/lib/Platform/Deprecated/StdLib
 			Path:	{Application}/Development/iTasks-SDK/Libraries
-		EnvironmentCompiler:	lib/exe/cocl::-dynamics -sapl -d
+		EnvironmentCompiler:	lib/exe/cocl::-dynamics -d
 		EnvironmentCodeGen:	lib/exe/cg
-		EnvironmentLinker:	/usr/bin/gcc::-g|lib/exe/sapl-collector-linker|lib/exe/itasks-web-collector
+		EnvironmentLinker:	/usr/bin/gcc::-g|lib/exe/itasks-web-collector
 		EnvironmentDynLink:	lib/exe/cclinker
+		EnvironmentABCOptimise:	lib/exe/abcopt
+		EnvironmentByteCodeGen:	lib/exe/bcgen
+		EnvironmentByteCodeLink:	lib/exe/bclink
+		EnvironmentByteCodeStrip:	lib/exe/bcstrip
+		EnvironmentByteCodePrelink:	lib/exe/bcprelink
 		EnvironmentVersion:	920
 		EnvironmentRedirect:	False
 		EnvironmentCompileMethod:	Pers
 		EnvironmentProcessor:	I386
-		Environment64BitProcessor:	True
\ No newline at end of file
+		Environment64BitProcessor:	True

Config/linux-x64/iTasks-git.env

@@ -9,13 +9,18 @@ Environments
 			Path:	{Application}/lib/Platform
 			Path:	{Application}/lib/Platform/Deprecated/Generics
 			Path:	{Application}/lib/Platform/Deprecated/StdLib
-			Path:	{Application}/lib/Sapl
+			Path:	{Application}/lib/ABCInterpreter
 			Path:	{Application}/lib/GraphCopy
 			Path:	{Application}/Development/iTasks-SDK/Libraries
-		EnvironmentCompiler:	lib/exe/cocl:-dynamics -sapl
+		EnvironmentCompiler:	lib/exe/cocl:-dynamics
 		EnvironmentCodeGen:	lib/exe/cg
-		EnvironmentLinker:	lib/exe/linker|lib/exe/sapl-collector-linker|lib/exe/itasks-web-collector
+		EnvironmentLinker:	lib/exe/linker|lib/exe/itasks-web-collector
 		EnvironmentDynLink:	lib/exe/linker
+		EnvironmentABCOptimise:	lib/exe/abcopt
+		EnvironmentByteCodeGen:	lib/exe/bcgen
+		EnvironmentByteCodeLink:	lib/exe/bclink
+		EnvironmentByteCodeStrip:	lib/exe/bcstrip
+		EnvironmentByteCodePrelink:	lib/exe/bcprelink
 		EnvironmentVersion:	920
 		EnvironmentRedirect:	False
 		EnvironmentCompileMethod:	Pers

Config/linux-x64/iTasks-tonic.env

@@ -9,13 +9,18 @@ Environments
 			Path:	{Application}/lib/Platform
 			Path:	{Application}/lib/Platform/Deprecated/Generics
 			Path:	{Application}/lib/Platform/Deprecated/StdLib
-			Path:	{Application}/lib/Sapl
+			Path:	{Application}/lib/ABCInterpreter
 			Path:	{Application}/lib/GraphCopy
 			Path:	{Application}/lib/iTasks
-		EnvironmentCompiler:	lib/exe/cocl-tonic:-dynamics -sapl -tonic
+		EnvironmentCompiler:	lib/exe/cocl-tonic:-dynamics -tonic
 		EnvironmentCodeGen:	lib/exe/cg
-		EnvironmentLinker:	lib/exe/linker|lib/exe/sapl-collector-linker|lib/exe/itasks-web-collector
+		EnvironmentLinker:	lib/exe/linker|lib/exe/itasks-web-collector
 		EnvironmentDynLink:	lib/exe/linker
+		EnvironmentABCOptimise:	lib/exe/abcopt
+		EnvironmentByteCodeGen:	lib/exe/bcgen
+		EnvironmentByteCodeLink:	lib/exe/bclink
+		EnvironmentByteCodeStrip:	lib/exe/bcstrip
+		EnvironmentByteCodePrelink:	lib/exe/bcprelink
 		EnvironmentVersion:	920
 		EnvironmentRedirect:	False
 		EnvironmentCompileMethod:	Pers

Config/linux-x64/iTasks.env

@@ -9,13 +9,18 @@ Environments
 			Path:	{Application}/lib/Platform
 			Path:	{Application}/lib/Platform/Deprecated/Generics
 			Path:	{Application}/lib/Platform/Deprecated/StdLib
-			Path:	{Application}/lib/Sapl
+			Path:	{Application}/lib/ABCInterpreter
 			Path:	{Application}/lib/GraphCopy
 			Path:	{Application}/lib/iTasks
-		EnvironmentCompiler:	lib/exe/cocl::-dynamics -sapl
+		EnvironmentCompiler:	lib/exe/cocl::-dynamics
 		EnvironmentCodeGen:	lib/exe/cg
-		EnvironmentLinker:	lib/exe/linker|lib/exe/sapl-collector-linker|lib/exe/itasks-web-collector
+		EnvironmentLinker:	lib/exe/linker|lib/exe/itasks-web-collector
 		EnvironmentDynLink:	lib/exe/linker
+		EnvironmentABCOptimise:	lib/exe/abcopt
+		EnvironmentByteCodeGen:	lib/exe/bcgen
+		EnvironmentByteCodeLink:	lib/exe/bclink
+		EnvironmentByteCodeStrip:	lib/exe/bcstrip
+		EnvironmentByteCodePrelink:	lib/exe/bcprelink
 		EnvironmentVersion:	920
 		EnvironmentRedirect:	False
 		EnvironmentCompileMethod:	Pers

Config/macos-x64/iTasks-dist.env

@@ -8,13 +8,18 @@ Version: 1.0
 			Path:	{Application}/lib/Platform
 			Path:	{Application}/lib/Platform/Deprecated/Generics
 			Path:	{Application}/lib/Platform/Deprecated/StdLib
-			Path:	{Application}/lib/Sapl
+			Path:	{Application}/lib/ABCInterpreter
 			Path:	{Application}/lib/GraphCopy
 			Path:	{Application}/lib/iTasks
-		EnvironmentCompiler:	lib/exe/cocl:-dynamics -sapl -desc -exl -d
+		EnvironmentCompiler:	lib/exe/cocl:-dynamics -desc -exl -d
 		EnvironmentCodeGen:	lib/exe/cg
-		EnvironmentLinker:	lib/exe/cclinker|lib/exe/sapl-collector-linker|lib/exe/itasks-web-collector
+		EnvironmentLinker:	lib/exe/cclinker|lib/exe/itasks-web-collector
 		EnvironmentDynLink:	lib/exe/cclinker
+		EnvironmentABCOptimise:	lib/exe/abcopt
+		EnvironmentByteCodeGen:	lib/exe/bcgen
+		EnvironmentByteCodeLink:	lib/exe/bclink
+		EnvironmentByteCodeStrip:	lib/exe/bcstrip
+		EnvironmentByteCodePrelink:	lib/exe/bcprelink
 		EnvironmentVersion:	920
 		EnvironmentRedirect:	False
 		EnvironmentCompileMethod:	Pers

Config/macos-x64/iTasks-git.env

@@ -9,13 +9,18 @@ Environments
 			Path:	{Application}/lib/Platform
 			Path:	{Application}/lib/Platform/Deprecated/Generics
 			Path:	{Application}/lib/Platform/Deprecated/StdLib
-			Path:	{Application}/lib/Sapl
+			Path:	{Application}/lib/ABCInterpreter
 			Path:	{Application}/lib/GraphCopy
 			Path:	{Application}/Development/iTasks-SDK/Libraries
-		EnvironmentCompiler:	lib/exe/cocl::-dynamics -sapl
+		EnvironmentCompiler:	lib/exe/cocl::-dynamics
 		EnvironmentCodeGen:	lib/exe/cg
-		EnvironmentLinker:	/usr/bin/gcc|lib/exe/sapl-collector-linker|lib/exe/itasks-web-collector
+		EnvironmentLinker:	/usr/bin/gcc|lib/exe/itasks-web-collector
 		EnvironmentDynLink:	/usr/bin/gcc
+		EnvironmentABCOptimise:	lib/exe/abcopt
+		EnvironmentByteCodeGen:	lib/exe/bcgen
+		EnvironmentByteCodeLink:	lib/exe/bclink
+		EnvironmentByteCodeStrip:	lib/exe/bcstrip
+		EnvironmentByteCodePrelink:	lib/exe/bcprelink
 		EnvironmentVersion:	920
 		EnvironmentRedirect:	False
 		EnvironmentCompileMethod:	Pers

Config/macos-x64/iTasks-tonic.env

@@ -9,13 +9,18 @@ Environments
 			Path:	{Application}/lib/Platform
 			Path:	{Application}/lib/Platform/Deprecated/Generics
 			Path:	{Application}/lib/Platform/Deprecated/StdLib
-			Path:	{Application}/lib/Sapl
+			Path:	{Application}/lib/ABCInterpreter
 			Path:	{Application}/lib/GraphCopy
 			Path:	{Application}/lib/iTasks
-		EnvironmentCompiler:	lib/exe/cocl-tonic::-dynamics -sapl -tonic
+		EnvironmentCompiler:	lib/exe/cocl-tonic::-dynamics -tonic
 		EnvironmentCodeGen:	lib/exe/cg
-		EnvironmentLinker:	/usr/bin/gcc|lib/exe/sapl-collector-linker|lib/exe/itasks-web-collector
+		EnvironmentLinker:	/usr/bin/gcc|lib/exe/itasks-web-collector
 		EnvironmentDynLink:	/usr/bin/gcc
+		EnvironmentABCOptimise:	lib/exe/abcopt
+		EnvironmentByteCodeGen:	lib/exe/bcgen
+		EnvironmentByteCodeLink:	lib/exe/bclink
+		EnvironmentByteCodeStrip:	lib/exe/bcstrip
+		EnvironmentByteCodePrelink:	lib/exe/bcprelink
 		EnvironmentVersion:	920
 		EnvironmentRedirect:	False
 		EnvironmentCompileMethod:	Pers

Config/macos-x64/iTasks.env

@@ -9,13 +9,18 @@ Environments
 			Path:	{Application}/lib/Platform
 			Path:	{Application}/lib/Platform/Deprecated/Generics
 			Path:	{Application}/lib/Platform/Deprecated/StdLib
-			Path:	{Application}/lib/Sapl
+			Path:	{Application}/lib/ABCInterpreter
 			Path:	{Application}/lib/GraphCopy
 			Path:	{Application}/lib/iTasks
-		EnvironmentCompiler:	lib/exe/cocl::-dynamics -sapl
+		EnvironmentCompiler:	lib/exe/cocl::-dynamics
 		EnvironmentCodeGen:	lib/exe/cg
-		EnvironmentLinker:	/usr/bin/gcc|lib/exe/sapl-collector-linker|lib/exe/itasks-web-collector
+		EnvironmentLinker:	/usr/bin/gcc|lib/exe/itasks-web-collector
 		EnvironmentDynLink:	/usr/bin/gcc
+		EnvironmentABCOptimise:	lib/exe/abcopt
+		EnvironmentByteCodeGen:	lib/exe/bcgen
+		EnvironmentByteCodeLink:	lib/exe/bclink
+		EnvironmentByteCodeStrip:	lib/exe/bcstrip
+		EnvironmentByteCodePrelink:	lib/exe/bcprelink
 		EnvironmentVersion:	920
 		EnvironmentRedirect:	False
 		EnvironmentCompileMethod:	Pers

Config/windows-x64/iTasks.env

@@ -13,13 +13,18 @@ Environments
 			Path:   {Application}\Libraries\Platform
 			Path:	{Application}\Libraries\Platform\Deprecated\Generics
             Path:   {Application}\Libraries\Platform\Deprecated\StdLib
-            Path:   {Application}\Libraries\Sapl
+            Path:   {Application}\Libraries\ABCInterpreter
             Path:   {Application}\Libraries\GraphCopy
             Path:   {Application}\Libraries\iTasks
-		EnvironmentCompiler:	Tools\Clean System 64\CleanCompiler64.exe : -h 128M : -sapl -dynamics
+		EnvironmentCompiler:	Tools\Clean System 64\CleanCompiler64.exe : -h 128M : -dynamics
 		EnvironmentCodeGen:	Tools\Clean System 64\CodeGenerator64.exe
-		EnvironmentLinker:	Tools\Clean System 64\StaticLinker.exe : -h 64M | Tools\Clean System\SaplCollectorLinker.exe | Tools\Clean System\WebResourceCollector.exe
+		EnvironmentLinker:	Tools\Clean System 64\StaticLinker.exe : -h 64M | Tools\Clean System\WebResourceCollector.exe
 		EnvironmentDynLink:	Tools\Clean System 64\DynamicLinker.exe
+		EnvironmentABCOptimise:	Tools\Clean System 64\ABCOptimiser.exe
+		EnvironmentByteCodeGen:	Tools\Clean System 64\ByteCodeGenerator.exe
+		EnvironmentByteCodeLink:	Tools\Clean System 64\ByteCodeLinker.exe
+		EnvironmentByteCodeStrip:	Tools\Clean System 64\ByteCodeStripper.exe
+		EnvironmentByteCodePrelink:	Tools\Clean System 64\ByteCodePrelinker.exe
 		EnvironmentVersion:	920
 		EnvironmentRedirect:	False
 		EnvironmentCompileMethod:	Pers

Config/windows-x86/iTasks-dist.env

-Version: 1.0
-Environments
-	Environment
-		EnvironmentName:	iTasks-dist
-		EnvironmentPaths
-			Path:	{Application}\Libraries\StdEnv
-			Path:	{Application}\Libraries\Dynamics
-			Path:	{Application}\Libraries\Dynamics\extension
-			Path:	{Application}\Libraries\Dynamics\general
-			Path:	{Application}\Libraries\Dynamics\implementation
-			Path:	{Application}\Libraries\Dynamics\implementation\windows
-			Path:	{Application}\Libraries\TCPIP
-			Path:   {Application}\Libraries\Platform
-			Path:	{Application}\Libraries\Platform\Deprecated\Generics
-            Path:   {Application}\Libraries\Platform\Deprecated\StdLib
-            Path:   {Application}\Libraries\Sapl
-            Path:   {Application}\Libraries\GraphCopy
-            Path:   {Application}\Development\iTasks-SDK\Libraries
-		EnvironmentCompiler:	Tools\Clean System\CleanCompiler.exe : -h 64M : -sapl -dynamics -generics -desc -exl -d
-		EnvironmentCodeGen:	Tools\Clean System\CodeGenerator.exe
-		EnvironmentLinker:	Tools\Clean System\StaticLinker.exe : -h 64M | Tools\Clean System\SaplCollectorLinker.exe | Tools\Clean System\WebResourceCollector.exe
-		EnvironmentDynLink:	Tools\Clean System\DynamicLinker.exe
-		EnvironmentVersion:	920
-		EnvironmentRedirect:	False
-		EnvironmentCompileMethod:	Pers
-		EnvironmentProcessor:	I386
-		Environment64BitProcessor:	False

Config/windows-x86/iTasks-git.env

-Version: 1.0
-Environments
-	Environment
-		EnvironmentName:	iTasks git
-		EnvironmentPaths
-			Path:	{Application}\Libraries\StdEnv
-			Path:	{Application}\Libraries\Dynamics
-			Path:	{Application}\Libraries\Dynamics\extension
-			Path:	{Application}\Libraries\Dynamics\general
-			Path:	{Application}\Libraries\Dynamics\implementation
-			Path:	{Application}\Libraries\Dynamics\implementation\windows
-			Path:	{Application}\Libraries\TCPIP
-			Path:   {Application}\Libraries\Platform
-			Path:	{Application}\Libraries\Platform\Deprecated\Generics
-            Path:   {Application}\Libraries\Platform\Deprecated\StdLib
-            Path:   {Application}\Libraries\Sapl
-            Path:   {Application}\Libraries\GraphCopy
-            Path:   {Application}\Development\iTasks-SDK\Libraries
-		EnvironmentCompiler:	Tools\Clean System\CleanCompiler.exe : -h 64M : -sapl -dynamics -generics
-		EnvironmentCodeGen:	Tools\Clean System\CodeGenerator.exe
-		EnvironmentLinker:	Tools\Clean System\StaticLinker.exe : -h 64M | Tools\Clean System\SaplCollectorLinker.exe | Tools\Clean System\WebResourceCollector.exe
-		EnvironmentDynLink:	Tools\Clean System\DynamicLinker.exe
-		EnvironmentVersion:	920
-		EnvironmentRedirect:	False
-		EnvironmentCompileMethod:	Pers
-		EnvironmentProcessor:	I386
-		Environment64BitProcessor:	False

Config/windows-x86/iTasks-tonic.env

-Version: 1.0
-Environments
-	Environment
-		EnvironmentName:	iTasks Tonic
-		EnvironmentPaths
-			Path:	{Application}\Libraries\StdEnv
-			Path:	{Application}\Libraries\Dynamics
-			Path:	{Application}\Libraries\Dynamics\extension
-			Path:	{Application}\Libraries\Dynamics\general
-			Path:	{Application}\Libraries\Dynamics\implementation
-			Path:	{Application}\Libraries\Dynamics\implementation\windows
-			Path:	{Application}\Libraries\TCPIP
-			Path:   {Application}\Libraries\Platform
-            Path:   {Application}\Libraries\Platform\Deprecated\Generics
-            Path:   {Application}\Libraries\Platform\Deprecated\StdLib
-            Path:   {Application}\Libraries\Sapl
-            Path:   {Application}\Libraries\GraphCopy
-            Path:   {Application}\Libraries\iTasks
-		EnvironmentCompiler:	Tools\Clean System\CleanCompilerTonic.exe : -h 128M : -sapl -dynamics -generics -tonic
-		EnvironmentCodeGen:	Tools\Clean System\CodeGenerator.exe
-		EnvironmentLinker:	Tools\Clean System\StaticLinker.exe : -h 64M | Tools\Clean System\SaplCollectorLinker.exe | Tools\Clean System\WebResourceCollector.exe
-		EnvironmentDynLink:	Tools\Clean System\DynamicLinker.exe
-		EnvironmentVersion:	920
-		EnvironmentRedirect:	False
-		EnvironmentCompileMethod:	Pers
-		EnvironmentProcessor:	I386
-		Environment64BitProcessor:	False

Config/windows-x86/iTasks.env

-Version: 1.0
-Environments
-	Environment
-		EnvironmentName:	iTasks
-		EnvironmentPaths
-			Path:	{Application}\Libraries\StdEnv
-			Path:	{Application}\Libraries\Dynamics
-			Path:	{Application}\Libraries\Dynamics\extension
-			Path:	{Application}\Libraries\Dynamics\general
-			Path:	{Application}\Libraries\Dynamics\implementation
-			Path:	{Application}\Libraries\Dynamics\implementation\windows
-			Path:	{Application}\Libraries\TCPIP
-			Path:   {Application}\Libraries\Platform
-			Path:	{Application}\Libraries\Platform\Deprecated\Generics
-            Path:   {Application}\Libraries\Platform\Deprecated\StdLib
-            Path:   {Application}\Libraries\Sapl
-            Path:   {Application}\Libraries\GraphCopy
-            Path:   {Application}\Libraries\iTasks
-		EnvironmentCompiler:	Tools\Clean System\CleanCompiler.exe : -h 64M : -sapl -dynamics
-		EnvironmentCodeGen:	Tools\Clean System\CodeGenerator.exe
-		EnvironmentLinker:	Tools\Clean System\StaticLinker.exe : -h 64M | Tools\Clean System\SaplCollectorLinker.exe | Tools\Clean System\WebResourceCollector.exe
-		EnvironmentDynLink:	Tools\Clean System\DynamicLinker.exe
-		EnvironmentVersion:	920
-		EnvironmentRedirect:	False
-		EnvironmentCompileMethod:	Pers
-		EnvironmentProcessor:	I386
-		Environment64BitProcessor:	False

Examples/Applications/Incidone/IncidoneCCC.prj.default

@@ -3,9 +3,12 @@ Global
 	ProjectRoot:	.
 	Target:	iTasks
 	Exec:	{Project}/IncidoneCCC.exe
+	ByteCode:	{Project}/IncidoneCCC.bc
 	CodeGen
 		CheckStacks:	False
 		CheckIndexes:	True
+		OptimiseABC:	True
+		GenerateByteCode:	True
 	Application
 		HeapSize:	209715200
 		StackSize:	1512000
@@ -25,7 +28,7 @@ Global
 			Stack:	False
 			Dynamics:	True
 			GenericFusion:	False
-			DescExL:	False
+			DescExL:	True
 		Output
 			Output:	ShowConstructors
 			Font:	Monaco
@@ -40,6 +43,9 @@ Global
 		ResourceSource:	
 		GenerateDLL:	False
 		ExportedNames:	
+		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

Examples/Applications/Incidone/WebPublic/index.html

@@ -8,13 +8,9 @@
 	<!-- Additional Incidone css -->
 	<link rel="stylesheet" href="/Incidone.css" type="text/css" >
 
-	<!-- Sapl dependencies -->
-	<script type="text/javascript" src="/js/sapl-utils.js"></script>
-	<script type="text/javascript" src="/js/sapl-builtin.js"></script>
-	<script type="text/javascript" src="/js/sapl-dynamic.js"></script>
-	<script type="text/javascript" src="/js/sapl-itasks.js"></script>
-	<script type="text/javascript" src="/js/sapl-rt.js"></script>
-	<script type="text/javascript" src="/js/sapl-support.js"></script>
+	<!-- ABC interpreter -->
+	<script type="text/javascript" src="/js/abc-instructions.js"></script>
+	<script type="text/javascript" src="/js/abc-interpreter.js"></script>
 
 	<!-- iTasks framework -->
 	<script type="text/javascript" src="/js/itasks-core.js"></script>
@@ -23,13 +19,13 @@
 	<script type="text/javascript" src="/js/itasks-components-display.js"></script>
 	<script type="text/javascript" src="/js/itasks-components-selection.js"></script>
 	<script type="text/javascript" src="/js/itasks-components-container.js"></script>
-	<script type="text/javascript" src="/js/itasks-js-interface.js"></script>
-
 
 	<!-- load iTasks viewport -->
 	<script type="text/javascript">
 	window.onload = function() {
-		itasks.viewport({syncTitle: true}, document.body);
+		ABC.loading_promise.finally(function(){
+			itasks.viewport({syncTitle: true}, document.body);
+		});
 	};
 	</script>
 </head>

Examples/Applications/ShipAdventure/C2/Apps/ShipAdventure/Core.icl

@@ -20,19 +20,6 @@ import C2.Apps.ShipAdventure.PathFinding, C2.Apps.ShipAdventure.Util
 
 derive class iTask ChoiceGrid, ChoiceRow
 
-derive JSEncode Map2D, Network, Coord2D, Cable, CableType, Section, Borders, Border
-derive JSEncode Device, SectionStatus, DeviceType, DeviceKind, User, Dir, Availability
-derive JSEncode Actor, ActorStatus, ActorEnergy, ActorHealth, Object, ObjectType
-derive JSEncode MapAction
-derive JSEncode Map, IntMap
-
-derive JSDecode Map2D, Network, Coord2D, Cable, CableType, Section, Borders, Border
-derive JSDecode Device, SectionStatus, DeviceType, DeviceKind, User, Dir, Availability
-derive JSDecode Actor, ActorStatus, ActorEnergy, ActorHealth, Object, ObjectType
-derive JSDecode MapAction
-derive JSDecode Map, IntMap
-
-
 // the next function should be placed in the library somewhere
 mkTable :: [String] ![a] -> (ChoiceGrid,[Int]) | gText{|*|} a
 mkTable header a = ({ChoiceGrid|header=header,rows=[{ChoiceRow|id=i,cells = row r} \\ r <- a & i <- [0..]]},[])

Examples/Applications/ShipAdventure/C2/Apps/ShipAdventure/Editor.icl

@@ -22,11 +22,6 @@ import Graphics.Scalable.Types
 //from Graphics.Scalable import normalFontDef, above, class margin(..), instance margin (Span,Span), px
 //from Graphics.Scalable import :: ImageOffset, :: Host(..)
 
-derive JSEncode Map2D, Section, Coord2D, Borders, Border, IntMap, Device, DeviceType, DeviceKind, CableType, Map
-derive JSEncode Network, Cable, Object, ObjectType, MapAction, SectionStatus, Dir
-derive JSDecode Map2D, Section, Coord2D, Borders, Border, IntMap, Device, DeviceType, DeviceKind, CableType, Map
-derive JSDecode Network, Cable, Object, ObjectType, MapAction, SectionStatus, Dir
-
 shipEditorTabs		:: Task ()
 shipEditorTabs		= allTasks [ viewLayout          <<@ Title "View Ship"
                                , editLayout          <<@ Title "Edit Ship"

Examples/Applications/ShipAdventure/C2/Apps/ShipAdventure/Types.icl

@@ -32,14 +32,6 @@ derive gText Set
 derive JSONEncode Set
 derive JSONDecode Set
 
-derive JSEncode Map2D, Coord2D, Map, IntMap, Dir, User, Section, Borders, Border, MapAction, Object, Actor
-derive JSEncode ObjectType, ActorStatus, Availability, ActorHealth, ActorEnergy, DeviceType, SectionStatus
-derive JSEncode Cable, Priority, Network, Device, CableType, DeviceKind, CommandAim, Set, Capability, CapabilityExpr
-derive JSDecode Map2D, Coord2D, Map, IntMap, Dir, User, Section, Borders, Border, MapAction, Object, Actor
-derive JSDecode ObjectType, ActorStatus, Availability, ActorHealth, ActorEnergy, DeviceType, SectionStatus
-derive JSDecode Cable, Priority, Network, Device, CableType, DeviceKind, CommandAim, Set, Capability, CapabilityExpr
-
-
 // std overloading instances
 
 //instance == Object      where (==) o1 o2 = o1 === o2

Examples/Applications/ShipAdventure/main.icl

@@ -17,7 +17,7 @@ Start world = doTasks
 	,onRequest "/" (ccMain registerTasks continuousTasks alwaysOnTasks optionalTasks <<@ (Title "C2 System"))