Move define scoped class ParserUtil from regex/ParserUtil.hx to expr/ParserUtil.hx.

Add Util to bypass tinks macros.

Author: skial

src/be/regex/ParserUtil.hx

@@ -1,44 +1,8 @@
 package be.regex;
 
-#if interp
-typedef ParserUtil = be.regex.std.ParserUtil;
+typedef ParserUtil =
+#if (interp || eval || macro)
+    be.regex.std.ParserUtil
 #else
-import uhx.sys.seri.Category;
-
-#if (eval || macro)
-import be.regex.Define;
-import haxe.macro.Expr;
-import haxe.macro.Context;
-#end
-
-import be.regex.RegexErrors;
-import uhx.sys.seri.Ranges;
-import be.regex.CodeUtil;
-import be.regex.RangeUtil;
-
-class ParserUtil {
-
-    #if (eval || macro)
-    private static var pythonStyle:Bool = Python; // \uHHHH or \UHHHHHHHH
-    private static var perlStyle:Bool = Neko || Cpp || Php || Lua || Java; // \x{HHHH}
-    private static var jsStyle:Bool = JavaScript || CSharp || Flash; // \uHHHH
-    private static var onlyBMP:Bool = JavaScript || CSharp;
-    #end
-
-    public macro static function pattern(s:String):ExprOf<String> {
-        var pos = Context.currentPos();
-        return macro @:pos(pos) $v{be.regex.std.ParserUtil.pattern(s, perlStyle, jsStyle, onlyBMP, pos)};
-    }
-
-    public macro static function category(category:String):ExprOf<String> {
-        var pos = Context.currentPos();
-        return if (((JavaScript && category.length == 1) || !(NodeJS || (ES_ && ES_ > 5))) && (jsStyle || pythonStyle || Cpp)) {
-            macro @:Disjunction $v{be.regex.std.ParserUtil.category(category, pythonStyle, perlStyle, jsStyle, onlyBMP, pos)};
-
-        } else {
-            macro @:Atom $v{be.regex.std.ParserUtil.category(category, pythonStyle, perlStyle, jsStyle, onlyBMP, pos)};
-        }
-    }
-
-}
-#end
+    be.regex.expr.ParserUtil
+#end;

src/be/regex/expr/ParserUtil.hx

@@ -0,0 +1,42 @@
+package be.regex.expr;
+
+import uhx.sys.seri.Category;
+
+#if (interp || eval || macro)
+import be.regex.Define;
+import haxe.macro.Expr;
+import haxe.macro.Context;
+#end
+
+import be.regex.RegexErrors;
+import uhx.sys.seri.Ranges;
+import be.regex.CodeUtil;
+import be.regex.RangeUtil;
+
+class ParserUtil {
+
+    #if (interp || eval || macro)
+    private static var pythonStyle:Bool = Python; // \uHHHH or \UHHHHHHHH
+    private static var perlStyle:Bool = Neko || Cpp || Php || Lua || Java; // \x{HHHH}
+    private static var jsStyle:Bool = JavaScript || CSharp || Flash; // \uHHHH
+    private static var onlyBMP:Bool = JavaScript || CSharp;
+    #end
+
+    public macro static function pattern(s:String):ExprOf<String> {
+        trace(s);
+        var pos = Context.currentPos();
+        return macro @:pos(pos) $v{be.regex.std.ParserUtil.pattern(s, perlStyle, jsStyle, onlyBMP, pos)};
+    }
+
+    public macro static function category(category:String):ExprOf<String> {
+        trace(category);
+        var pos = Context.currentPos();
+        return if (((JavaScript && category.length == 1) || !(NodeJS || (ES_ && ES_ > 5))) && (jsStyle || pythonStyle || Cpp)) {
+            macro @:Disjunction $v{be.regex.std.ParserUtil.category(category, pythonStyle, perlStyle, jsStyle, onlyBMP, pos)};
+
+        } else {
+            macro @:Atom $v{be.regex.std.ParserUtil.category(category, pythonStyle, perlStyle, jsStyle, onlyBMP, pos)};
+        }
+    }
+
+}

src/be/regex/std/ParserUtil.hx

@@ -7,7 +7,7 @@ import be.regex.RegexErrors;
 import uhx.sys.seri.Category;
 
 typedef Pos = 
-#if (macro || eval) 
+#if (interp || eval || macro) 
     haxe.macro.Expr.Position 
 #else 
     haxe.PosInfos 
@@ -24,7 +24,7 @@ class ParserUtil {
     */
 
     private static function error(message:String, ?pos:Pos) {
-        #if (macro || eval)
+        #if (interp || eval || macro)
         haxe.macro.Context.error(message, pos);
         #else
         throw message;

test/be/regex/RegexSpec.hx

@@ -1,5 +1,6 @@
 package be.regex;
 
+import be.regex.Util;
 import be.Regex;
 /**
     Only the JavaScript implementation is
@@ -51,6 +52,8 @@ class RegexSpec {
         // a⁴ +
         trace( regexp.matched(0) );
 
+        trace( Util.bar() );
+
         return asserts.done();
     }
 

test/be/regex/Util.hx

@@ -0,0 +1,11 @@
+package be.regex;
+
+import be.Regex;
+
+class Util {
+
+    public static macro function bar() {
+        return macro $v{Regex.category('No')};
+    }
+
+}