libregexp: improve the transition to next available thread, instruction, and generation

[plan9front.git] / sys / src / libregexp / regimpl.h

diff --git a/sys/src/libregexp/regimpl.h b/sys/src/libregexp/regimpl.h
index f173a970c939d68531c64e7e77e42868ad735bb5..8785a27f0e405b88b7fa5ddd8c5ce2fdce411af7 100644 (file)
--- a/sys/src/libregexp/regimpl.h
+++ b/sys/src/libregexp/regimpl.h
@@ -1,5 +1,4 @@
-enum
-{
+enum {
        LANY = 0,
        LBOL,
        LCLASS,
@@ -30,8 +29,7 @@ enum
 typedef struct Parselex Parselex;
 typedef struct Renode Renode;
 
-struct Parselex
-{
+struct Parselex {
        /* Parse */
        Renode *next;
        Renode *nodes;
@@ -50,8 +48,8 @@ struct Parselex
        Rune cpairs[400+2];
        int nc;
 };
-struct Renode
-{
+
+struct Renode {
        int op;
        Renode *left;
        Rune r;
@@ -63,15 +61,15 @@ struct Renode
        };
        int nclass;
 };
-struct Rethread
-{
-       Reinst *pc;
+
+struct Rethread {
+       Reinst *i;
        Resub sem[NSUBEXPM];
-       int pri;
        Rethread *next;
+       int gen;
 };
-struct Reinst
-{
+
+struct Reinst {
        char op;
        int gen;
        Reinst *a;