1 files changed, 10 insertions, 5 deletions

diff --git a/lpvm.h b/lpvm.h
index 6633c4b..19f4108 100644
--- a/lpvm.h
+++ b/lpvm.h
@@ -17,17 +17,18 @@ typedef enum Opcode {
   ITestChar,  /* if char != aux, jump to 'offset' */
   ITestSet,  /* if char not in buff, jump to 'offset' */
   ISpan,  /* read a span of chars in buff */
+  IUTFR,  /* if codepoint not in range [offset, utf_to], fail */
   IBehind,  /* walk back 'aux' characters (fail if not possible) */
   IRet,  /* return from a rule */
   IEnd,  /* end of pattern */
   IChoice,  /* stack a choice; next fail will jump to 'offset' */
-  IPredChoice,  /* labeld failure: stack a choice; changes label env next fail will jump to 'offset' */
+  IPredChoice,  /* labeld failure: stack a choice; changes label env next fail will jump to 'offset' */ /*labeled failure */
   IJmp,  /* jump to 'offset' */
   ICall,  /* call rule at 'offset' */
   IOpenCall,  /* call rule number 'key' (must be closed to a ICall) */
   ICommit,  /* pop choice and jump to 'offset' */
   IPartialCommit,  /* update top choice to current position and jump */
-  IBackCommit,  /* "fails" but jump to its own 'offset' */
+  IBackCommit,  /* backtrack like "fail" but jump to its own 'offset' */
   IFailTwice,  /* pop one choice and then fail */
   IFail,  /* go back to saved state on choice and jump to saved offset */
   IGiveup,  /* internal use */
@@ -35,8 +36,9 @@ typedef enum Opcode {
   IOpenCapture,  /* start a capture */
   ICloseCapture,
   ICloseRunTime,
-  IThrow,    /* fails with a given label */
-  IThrowRec, /* fails with a given label and call rule at 'offset' */
+  IThrow,    /* fails with a given label */ /*labeled failure */
+  IThrowRec, /* fails with a given label and call rule at 'offset' */ /*labeled failure */
+  IEmpty  /* to fill empty slots left by optimizations */
 } Opcode;
 
 
@@ -52,10 +54,13 @@ typedef union Instruction {
 } Instruction;
 
 
+/* extract 24-bit value from an instruction */
+#define utf_to(inst)    (((inst)->i.key << 8) | (inst)->i.aux)
+
+
 void printpatt (Instruction *p, int n);
 const char *match (lua_State *L, const char *o, const char *s, const char *e,
                    Instruction *op, Capture *capture, int ptop, short *labelf, const char **sfail); /* labeled failure */
 
-
 #endif