port EDGE_CHARRANGE to jvm backend

Author: FROGGS

src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java

@@ -4850,7 +4850,9 @@ public static SixModelObject nfafromstatelist(SixModelObject states, SixModelObj
                     nfa.states[i][curEdge].arg_s = edgeInfo.at_pos_boxed(tc, j + 1).get_str(tc);
                     break;
                 case NFA.EDGE_CODEPOINT_I:
-                case NFA.EDGE_CODEPOINT_I_NEG: {
+                case NFA.EDGE_CODEPOINT_I_NEG:
+                case NFA.EDGE_CHARRANGE:
+                case NFA.EDGE_CHARRANGE_NEG: {
                     SixModelObject arg = edgeInfo.at_pos_boxed(tc, j + 1);
                     nfa.states[i][curEdge].arg_lc = (char)smart_numify(arg.at_pos_boxed(tc, 0), tc);
                     nfa.states[i][curEdge].arg_uc = (char)smart_numify(arg.at_pos_boxed(tc, 1), tc);
@@ -5015,6 +5017,20 @@ else if (act == NFA.EDGE_CODEPOINT_I_NEG) {
                         if (ord != lc_arg && ord != uc_arg)
                             nextst.add(to);
                     }
+                    else if (act == NFA.EDGE_CHARRANGE) {
+                        char uc_arg = edgeInfo[i].arg_uc;
+                        char lc_arg = edgeInfo[i].arg_lc;
+                        char ord = target.charAt((int)pos);
+                        if (ord >= lc_arg && ord <= uc_arg)
+                            nextst.add(to);
+                    }
+                    else if (act == NFA.EDGE_CHARRANGE_NEG) {
+                        char uc_arg = edgeInfo[i].arg_uc;
+                        char lc_arg = edgeInfo[i].arg_lc;
+                        char ord = target.charAt((int)pos);
+                        if (ord < lc_arg || ord > uc_arg)
+                            nextst.add(to);
+                    }
                 }
             }
 

src/vm/jvm/runtime/org/perl6/nqp/sixmodel/reprs/NFA.java

@@ -20,6 +20,9 @@ public class NFA extends REPR {
     public static final int EDGE_CHARLIST_NEG     = 7;
     public static final int EDGE_CODEPOINT_I      = 9;
     public static final int EDGE_CODEPOINT_I_NEG  = 10;
+    public static final int EDGE_GENERIC_VAR      = 11;
+    public static final int EDGE_CHARRANGE        = 12;
+    public static final int EDGE_CHARRANGE_NEG    = 13;
 
     public SixModelObject type_object_for(ThreadContext tc, SixModelObject HOW) {
         STable st = new STable(this, HOW);
@@ -79,7 +82,9 @@ public void deserialize_finish(ThreadContext tc, STable st,
                         body.states[i][j].arg_s = reader.readStr();
                         break;
                     case EDGE_CODEPOINT_I:
-                    case EDGE_CODEPOINT_I_NEG: {
+                    case EDGE_CODEPOINT_I_NEG:
+                    case EDGE_CHARRANGE:
+                    case EDGE_CHARRANGE_NEG: {
                         body.states[i][j].arg_lc = (char)reader.readLong();
                         body.states[i][j].arg_uc = (char)reader.readLong();
                         break;
@@ -121,7 +126,9 @@ public void serialize(ThreadContext tc, SerializationWriter writer, SixModelObje
                     writer.writeStr(body.states[i][j].arg_s);
                     break;
                 case EDGE_CODEPOINT_I:
-                case EDGE_CODEPOINT_I_NEG: {
+                case EDGE_CODEPOINT_I_NEG:
+                case EDGE_CHARRANGE:
+                case EDGE_CHARRANGE_NEG: {
                     writer.writeInt(body.states[i][j].arg_lc);
                     writer.writeInt(body.states[i][j].arg_uc);
                     break;