diff --git a/kiss/src/kiss/Macros.hx b/kiss/src/kiss/Macros.hx index c9223a20..ed32f7b2 100644 --- a/kiss/src/kiss/Macros.hx +++ b/kiss/src/kiss/Macros.hx @@ -202,7 +202,6 @@ class Macros { for (matchBodySymbol in matchBodySymbols) { caseInterp.variables.set(Prelude.symbolNameValue(matchBodySymbol), matchBodies.shift()); } - prepareForConditional(caseInterp, k); try { var hscriptStr = Prelude.convertToHScript(caseStr); #if test diff --git a/kiss/src/kiss/Reader.hx b/kiss/src/kiss/Reader.hx index d88c766d..e7d40ab3 100644 --- a/kiss/src/kiss/Reader.hx +++ b/kiss/src/kiss/Reader.hx @@ -514,7 +514,7 @@ class Reader { name; case RawHaxe(code): // #| haxeCode() |# - '#| $code |#'; + '#{ $code }#'; case RawHaxeBlock(code): // #{ haxeCode(); moreHaxeCode(); }# '#{ $code }#'; diff --git a/kiss/src/test/cases/BasicTestCase.kiss b/kiss/src/test/cases/BasicTestCase.kiss index a926d91c..9f597281 100644 --- a/kiss/src/test/cases/BasicTestCase.kiss +++ b/kiss/src/test/cases/BasicTestCase.kiss @@ -522,8 +522,9 @@ From:[(assert false (+ \"false \" \"should \" \"have \" \"been \" \"true\"))]" m (Assert.equals 5 (assertLet [(Some thing) some5] thing)))) (function _testRawString [] - (Assert.equals #| "\\" |# #"\"#) - (Assert.equals #| "\"#" |# ##""#"##)) +// Test escaped back slash with the raw haxe non-espaced backslash + (Assert.equals "\\" #"\"#) + (Assert.equals "\"#" ##""#"##)) (function _testKissStrings [] (Assert.equals #| "\\\t\r\n\"$" |# "\\\t\r\n\"\$") diff --git a/kiss/src/test/cases/ReaderMacroTestCase.kiss b/kiss/src/test/cases/ReaderMacroTestCase.kiss index 46765481..8b73a477 100644 --- a/kiss/src/test/cases/ReaderMacroTestCase.kiss +++ b/kiss/src/test/cases/ReaderMacroTestCase.kiss @@ -16,7 +16,7 @@ (var mySum (pluppers fluffers buffers)) // Read b c directly as strings -(defReaderMacro ["b" "c"] [stream] #|ReaderExp.StrExp(stream.expect("b, or c", function () stream.takeChars(1)))|#) +(defReaderMacro ["b" "c"] [stream] #{ReaderExp.StrExp(stream.expect("b, or c", function () stream.takeChars(1)))}#) (var str1 b) (var str2 c) diff --git a/projects/aoc/src/Util.kiss b/projects/aoc/src/Util.kiss index 40fb8a0f..03e0b76c 100644 --- a/projects/aoc/src/Util.kiss +++ b/projects/aoc/src/Util.kiss @@ -8,10 +8,10 @@ (.filter (for paragraph (.split - (.replace (File.getContent file) #|"\r"|# "") - #|"\n\n"|#) + (.replace (File.getContent file) "\r" "") + "\n\n") (.filter - (paragraph.split #|"\n"|#) + (paragraph.split "\n") (lambda [line] (< 0 line.length)))) (lambda [lines] (< 0 lines.length)))) diff --git a/projects/aoc/src/year2020/EvasionDSL.kiss b/projects/aoc/src/year2020/EvasionDSL.kiss index 3a74b436..f2b3be48 100644 --- a/projects/aoc/src/year2020/EvasionDSL.kiss +++ b/projects/aoc/src/year2020/EvasionDSL.kiss @@ -34,4 +34,4 @@ (if (stream.isEmpty) null `(,(b.symbol (stream.expect "a ship command" ->(stream.takeChars 1))) - ,(b.symbol (stream.expect "a number argument" ->(stream.takeUntilAndDrop #|"\n"|#)))))) + ,(b.symbol (stream.expect "a number argument" ->(stream.takeUntilAndDrop "\n")))))) diff --git a/projects/aoc/src/year2020/FerrySimDSL.kiss b/projects/aoc/src/year2020/FerrySimDSL.kiss index 5369fb4b..358e7e7c 100644 --- a/projects/aoc/src/year2020/FerrySimDSL.kiss +++ b/projects/aoc/src/year2020/FerrySimDSL.kiss @@ -3,7 +3,7 @@ (function :FerrySquare emptySeat [:Array n :SeatsChanged changed] // Empty seats with completely empty neighbors, fill up (cond - ((= true (apply = (for neighbor n #|neighbor != fullSeat|#))) + ((= true (apply = (for neighbor n #{neighbor != fullSeat}#))) (set changed.changed true) fullSeat) (true emptySeat))) @@ -11,7 +11,7 @@ (function :FerrySquare fullSeat [:Array n :SeatsChanged changed] // Full seats with 4 or more full neighbors become empty (cond - ((<= 4 (count n (lambda [neighbor] #|neighbor == fullSeat|#))) + ((<= 4 (count n (lambda [neighbor] #{neighbor == fullSeat}#))) (set changed.changed true) emptySeat) (true fullSeat))) @@ -43,7 +43,7 @@ (for :Array row state (apply + (for :FerrySquare seat row - (if #|seat == fullSeat|# 1 0)))))) + (if #{seat == fullSeat}# 1 0)))))) (defReaderMacro "L" [stream] `emptySeat) (defReaderMacro "#" [stream] `fullSeat) @@ -51,4 +51,4 @@ (undefReaderMacro "...") (defReaderMacro &start "" [stream] - `(state.push ,(ReaderExp.ListExp (readExpArray stream #|"\n"|#)))) + `(state.push ,(ReaderExp.ListExp (readExpArray stream "\n")))) diff --git a/projects/aoc/src/year2020/Passports.kiss b/projects/aoc/src/year2020/Passports.kiss index bd254a2a..4c483d3b 100644 --- a/projects/aoc/src/year2020/Passports.kiss +++ b/projects/aoc/src/year2020/Passports.kiss @@ -4,7 +4,7 @@ (let [key (stream.expect "passport key" (lambda [] (stream.takeUntilAndDrop ":"))) value (stream.expect "passport value" (lambda [] (stream.takeUntilOneOf [" " "\n"] true)))] (dictSet pp key value)) - (if (= #|"\n\n"|# (try (stream.expect "paragraph break" (lambda [] (stream.peekChars 2))) (catch [e] ""))) + (if (= "\n\n" (try (stream.expect "paragraph break" (lambda [] (stream.peekChars 2))) (catch [e] ""))) (begin (stream.dropWhitespace) pp) (begin (stream.dropWhitespace) (readPassport stream pp)))) diff --git a/projects/aoc/src/year2020/Solutions2020.kiss b/projects/aoc/src/year2020/Solutions2020.kiss index a5d4e9f6..cb30eb32 100644 --- a/projects/aoc/src/year2020/Solutions2020.kiss +++ b/projects/aoc/src/year2020/Solutions2020.kiss @@ -126,7 +126,7 @@ dist (Adapters.distribution diffs)] (assert (= 1998 (* (dictGet dist 1) (dictGet dist 3))))) (let [memoized (memoize Adapters.arrangementCount)] - (set Adapters.arrangementCount #|cast memoized|#)) + (set Adapters.arrangementCount #{cast memoized}#)) (assert (= "347250213298688" (Int64.toStr (Adapters.arrangementCount adapters 0)))))) (day 11 diff --git a/projects/aoc/src/year2021/Solutions2021.kiss b/projects/aoc/src/year2021/Solutions2021.kiss index 65f98b7f..b6ba93cb 100644 --- a/projects/aoc/src/year2021/Solutions2021.kiss +++ b/projects/aoc/src/year2021/Solutions2021.kiss @@ -4,7 +4,7 @@ `(let [theMap ,theMap key ,key amount ,amount &mut count (dictGet theMap key)] (unless count (dictSet theMap key (set count (Int64Helper.fromFloat 0)))) - (dictSet theMap key #|count + amount|#))) + (dictSet theMap key #{count + amount}#))) // Remove and return an arbitrary key-value pair from the given Map (function :Array dictShift [:Map m] diff --git a/projects/aoc/src/year2021/day5.kiss b/projects/aoc/src/year2021/day5.kiss index 7a1c7254..58e3a527 100644 --- a/projects/aoc/src/year2021/day5.kiss +++ b/projects/aoc/src/year2021/day5.kiss @@ -37,4 +37,4 @@ (function :Int numHotPositions [file &opt :Bool part2] (let [theMap (ventsByPos file ?part2) two (Int64Helper.fromFloat 2)] - (count theMap ->vents #| vents >= two |#))) \ No newline at end of file + (count theMap ->vents #{ vents >= two }#))) \ No newline at end of file diff --git a/projects/aoc/src/year2021/day6.kiss b/projects/aoc/src/year2021/day6.kiss index b929b468..80c9bf0f 100644 --- a/projects/aoc/src/year2021/day6.kiss +++ b/projects/aoc/src/year2021/day6.kiss @@ -9,7 +9,7 @@ (doFor age list (let [count (dictGet theMap age) one (Int64Helper.fromFloat 1)] - (dictSet theMap age #|count + one|#))) + (dictSet theMap age #{count + one}#))) theMap)) (function :Map stepAgeMap [:Map theMap] diff --git a/projects/flixel-desktop-habit-puzzle-game/source/HabitModel.kiss b/projects/flixel-desktop-habit-puzzle-game/source/HabitModel.kiss index 3ff8256a..a08d6a0b 100644 --- a/projects/flixel-desktop-habit-puzzle-game/source/HabitModel.kiss +++ b/projects/flixel-desktop-habit-puzzle-game/source/HabitModel.kiss @@ -178,16 +178,16 @@ (if lastDayDone (DateTime.fromString lastDayDone) (let [&mut now (DateTime.fromDate (Date.now))] - (until (= 1 (now.getDay)) #|now -= oneDayInterval;|#) + (until (= 1 (now.getDay)) #{now -= oneDayInterval;}#) now))] (until (and (= (nextDay.getDay) (dayToEndSearch.getDay)) (= (nextDay.getMonth) (dayToEndSearch.getMonth)) (= (nextDay.getYear) (dayToEndSearch.getYear))) (let [daysInMonth (DateTime.daysInMonth (nextDay.getMonth) (nextDay.isLeapYear)) adjustedDays (for day days (% (+ daysInMonth day) daysInMonth))] (when (contains adjustedDays (nextDay.getDay)) (return true))) - #|nextDay -= oneDayInterval|#) + #{nextDay -= oneDayInterval}#) (return false))) ((Interval days lastDayDone) - (or !lastDayDone (<= days #|(DateTime.fromDate(Date.now()) - DateTime.fromString(lastDayDone)).getTotalDays()|#))) + (or !lastDayDone (<= days #{(DateTime.fromDate(Date.now()) - DateTime.fromString(lastDayDone)).getTotalDays()}#))) (Todo (= 0 .points (activeLabel e))) (otherwise true))) diff --git a/projects/godot-squash-the-creeps-3d/scripts/Player.kiss b/projects/godot-squash-the-creeps-3d/scripts/Player.kiss index 111ce41c..81ea08d1 100644 --- a/projects/godot-squash-the-creeps-3d/scripts/Player.kiss +++ b/projects/godot-squash-the-creeps-3d/scripts/Player.kiss @@ -18,7 +18,7 @@ (when !(= direction Vector3.ZERO) (set direction (direction.normalized)) // TODO for some reason, the Vector3 addition operator is only found when used in a raw haxe expr: - (pivot.lookAt #|translation + direction|# Vector3.UP)) + (pivot.lookAt #{translation + direction}# Vector3.UP)) (set _velocity.x (* direction.x speed)) (set _velocity.z (* direction.z speed)) diff --git a/projects/handloose/source/TypingState.kiss b/projects/handloose/source/TypingState.kiss index 308bbe91..62406d3f 100644 --- a/projects/handloose/source/TypingState.kiss +++ b/projects/handloose/source/TypingState.kiss @@ -3,7 +3,7 @@ (var TEXT_SIZE 24) (prop &mut :FlxText docText null) (method &override :Void create [] - #|{ + #{ super.create(); var background = new FlxSprite(); @@ -38,7 +38,7 @@ add(actionSprites); - }|#) + }#) (prop :Map inputCodes (new Map)) (var DIR_ORDER [ Left Down Up Right ]) @@ -57,10 +57,10 @@ (set timer (new FlxTimer)) (let [&mut i 0] (timer.start ARROW_DELAY ->_ { - #|{ + #{ var stuff = _model.generateArrowStuff(); makeTriangleSprite(DIR_ORDER[i++ % DIR_ORDER.length], stuff.text, -SPRITE_SIZE, stuff.action); - }|# } 0))) + }# } 0))) (whenLet [(Some id) (getFirstInputId) dir (dictGet inputCodes id)] (let [&mut :ActionSprite lowestMatching null @@ -98,7 +98,7 @@ (updateDocText)) (method :FlxSprite makeTriangleSprite [:ArrowDir dir :String text :Int y &opt :Void->Void action] - #|{ + #{ var spr = new ActionSprite(action, dir); spr.makeGraphic(SPRITE_SIZE, SPRITE_SIZE, FlxColor.TRANSPARENT, true); FlxSpriteUtil.beginDraw(FlxColor.WHITE); @@ -147,4 +147,4 @@ } return spr; - }|#) \ No newline at end of file + }#) \ No newline at end of file