regex engine - simplify regnode structures and make them consistent

This eliminates the regnode_2L data structure, and merges it with the older
regnode_2 data structure. At the same time it makes each "arg" property of the
various regnode types that have one be consistently structured as an anonymous
union like this:

    union {
        U32 arg1u;
        I32 arg2i;
        struct {
            U16 arg1a;
            U16 arg1b;
        };
    };

We then expose four macros for accessing each slot: ARG1u() ARG1i() and
ARG1a() and ARG1b(). Code then explicitly designates which they want. The old
logic used ARG() to access an U32 arg1, and ARG1() to access an I32 arg1,
which was confusing to say the least. The regnode_2L structure had a U32 arg1,
and I32 arg2, and the regnode_2 data strucutre had two I32 args. With the new
set of macros we use the regnode_2 for both, and use the appropriate macros to
show whether we want to signed or unsigned values.

This also renames the regnode_4 to regnode_3. The 3 stands for "three 32-bit
args". However as each slot can also store two U16s, a regnode_3 can hold up
to 6 U16s, or as 3 I32's, or a combination. For instance the CURLY style nodes
use regnode_3 to store 4 values, ARG1i() for min count, ARG2i() for max count
and ARG3a() and ARG3b() for parens before and inside the quantifier.

It also changes the functions reganode() to reg1node() and changes reg2Lanode()
to reg2node(). The 2L thing was just confusing.

1 files changed, 7 insertions, 8 deletions

diff --git a/embed.fnc b/embed.fnc
index 212df9d0ca..176dc27c80 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -5141,9 +5141,6 @@ ES	|regnode_offset|reg	|NN RExC_state_t *pRExC_state		\
 				|I32 paren				\
 				|NN I32 *flagp				\
 				|U32 depth
-ES	|regnode_offset|reganode|NN RExC_state_t *pRExC_state		\
-				|U8 op					\
-				|U32 arg
 ES	|regnode_offset|regatom |NN RExC_state_t *pRExC_state		\
 				|NN I32 *flagp				\
 				|U32 depth
@@ -5167,11 +5164,6 @@ ES	|void	|reginsert	|NN RExC_state_t *pRExC_state		\
 				|const U8 op				\
 				|const regnode_offset operand		\
 				|const U32 depth
-ES	|regnode_offset|reg2Lanode					\
-				|NN RExC_state_t *pRExC_state		\
-				|const U8 op				\
-				|const U32 arg1 			\
-				|const I32 arg2
 ES	|regnode_offset|reg_la_NOTHING					\
 				|NN RExC_state_t *pRExC_state		\
 				|U32 flags				\
@@ -5180,6 +5172,13 @@ ES	|regnode_offset|reg_la_OPFAIL					\
 				|NN RExC_state_t *pRExC_state		\
 				|U32 flags				\
 				|NN const char *type
+ES	|regnode_offset|reg1node|NN RExC_state_t *pRExC_state		\
+				|U8 op					\
+				|U32 arg
+ES	|regnode_offset|reg2node|NN RExC_state_t *pRExC_state		\
+				|const U8 op				\
+				|const U32 arg1 			\
+				|const I32 arg2
 ES	|regnode_offset|reg_node|NN RExC_state_t *pRExC_state		\
 				|U8 op
 ES	|regnode_offset|regnode_guts					\