change raw haxe

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

src/kiss/Reader.hx

@@ -514,7 +514,7 @@ class Reader {
                 name;
             case RawHaxe(code):
                 // #| haxeCode() |#
-                '#| $code |#';
+                '#{ $code }#';
             case RawHaxeBlock(code):
                 // #{ haxeCode(); moreHaxeCode(); }#
                 '#{ $code }#';

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\"\$")

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)