Commit 9f3512a4 authored by Camil Staps's avatar Camil Staps 🍃

# This is a combination of 5 commits.

# This is the 1st commit message:
Merge branch 'master' of https://gitlab.science.ru.nl/clean-and-itasks/iTasks-SDK into server-and-client-side-svg-rendering

# This is the commit message #2:

trying to get it compiled again, fails due to 'Error [iTasks.Extensions.SVG.SVGEditor.icl,17,import]: fold not exported as a function/macro by module Data.Set'

# This is the commit message #3:

missing merge conflict resolved

# This is the commit message #4:

minor edit: space re-inserted

# This is the commit message #5:

fixed imports

# This is the commit message #6:

compiles again, now need to resolve linker-errors

# This is the commit message #7:

fix merge problems and imports

# This is the commit message #8:

Merge branch 'server-and-client-side-svg-rendering' of gitlab.science.ru.nl:clean-and-itasks/iTasks-SDK into server-and-client-side-svg-rendering

# This is the commit message #9:

Merge branch 'server-and-client-side-svg-rendering' of https://gitlab.science.ru.nl/clean-and-itasks/iTasks-SDK into server-and-client-side-svg-rendering

# Conflicts:
#	Libraries/iTasks/Extensions/SVG/SVGEditor.icl

# This is the commit message #10:

Merge branch 'master' into server-and-client-side-svg-rendering

# This is the commit message #1:

Merge branch 'master' into server-and-client-side-svg-rendering

# This is the commit message #2:

Merge remote-tracking branch 'remotes/origin/master' into server-and-client-side-svg-rendering

# This is the commit message #3:

Merge abc-interpreter-instead-of-sapl into server-and-client-side-svg-rendering-with-abc-interpreter

# This is the commit message #4:

Merge abc-interpreter-instead-of-sapl into server-and-client-side-svg-rendering-with-abc-interpreter

# This is the commit message #5:

Fix imports after merging abc-interpreter-instead-of-sapl
parent 5e3be4f1
......@@ -2,7 +2,6 @@ implementation module C2.Apps.ShipAdventure.Core
import iTasks.Extensions.DateTime
from iTasks.Extensions.SVG.SVGEditor import :: SVGEditor(..), :: TagSource, fromSVGEditor
import iTasks.UI.JS.Encoding
import qualified Data.List as DL
import qualified Data.Map as DM
import Data.Map.GenJSON
......
implementation module C2.Apps.ShipAdventure.Editor
from iTasks.Extensions.SVG.SVGEditor import :: SVGEditor(..), :: TagSource, fromSVGEditor
import iTasks.UI.JS.Encoding
import iTasks.Extensions.JSONFile
import iTasks.Internal.IWorld
import iTasks.UI.Layout, iTasks.UI.Definition
......
......@@ -5,7 +5,6 @@ implementation module C2.Apps.ShipAdventure.Types
import iTasks.Internal.Tonic
import iTasks.Extensions.Admin.TonicAdmin
from iTasks.Extensions.SVG.SVGEditor import :: SVGEditor(..), :: TagSource, fromSVGEditor
import iTasks.UI.JS.Encoding
import qualified Data.List as DL
from Data.Func import mapSt
import StdArray
......
definition module iTasks.Extensions.SVG.SVGEditor
from Data.GenEq import generic gEq
import Graphics.Scalable.Image
from Text.GenJSON import :: JSONNode, generic JSONEncode, generic JSONDecode
from iTasks.Internal.Generic.Visualization import :: TextFormat, generic gText
......
......@@ -29,6 +29,7 @@ from Graphics.Scalable.Image import :: XYAlign(..), :: StrokeAttr(..), :: LineEn
from Graphics.Scalable.Image import :: GridDimension(..), :: StrokeWidthAttr(..), :: OnClickAttr(..), :: XRadiusAttr(..), :: YRadiusAttr(..)
from Graphics.Scalable.Image import class *.(..), class /.(..)
import Graphics.Scalable.Internal.Image`
import Graphics.Scalable.Internal.Types
import iTasks.Internal.Tonic.AbsSyn
import iTasks.Internal.Tonic.Types
import iTasks.Internal.Tonic.Pretty
......
......@@ -21,7 +21,7 @@ import Text.GenJSON
| JSTypeOf !JSVal
| JSDelete !JSVal // actually a statement, not an expression
| JSObject !{!JSObjectElement}
| JSObject !{#JSObjectElement}
| JSArray !{!JSVal}
| JSCall !JSVal !{!JSVal}
......@@ -92,7 +92,7 @@ where
# dest & [i]='}'
-> (dest,i+1)
with
copy_elems :: !{!JSObjectElement} !Int !*{#Char} !Int -> (!.{#Char}, !Int)
copy_elems :: !{#JSObjectElement} !Int !*{#Char} !Int -> (!.{#Char}, !Int)
copy_elems elems k dest i
# {key,val} = elems.[k]
# (dest,i) = copy_chars key dest i
......
Markdown is supported
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