Skip to content

A
abc
Commit 3be417ae by Alan Mishchenko
Options

Fix inconsistency between operators and symbols in Wlc_Ntk_t.

parent 55e7dd16
Showing with 38 additions and 37 deletions
src/base/wlc/wlc.h
...@@ -68,25 +68,25 @@ typedef enum { ...@@ -68,25 +68,25 @@ typedef enum {
WLC_OBJ_LOGIC_NOT, // 23: logic NOT WLC_OBJ_LOGIC_NOT, // 23: logic NOT
WLC_OBJ_LOGIC_AND, // 24: logic AND WLC_OBJ_LOGIC_AND, // 24: logic AND
WLC_OBJ_LOGIC_OR, // 25: logic OR WLC_OBJ_LOGIC_OR, // 25: logic OR
WLC_OBJ_LOGIC_XOR, // 26: logic XOR WLC_OBJ_LOGIC_XOR, // 27: logic XOR
WLC_OBJ_COMP_EQU, // 27: compare equal WLC_OBJ_COMP_EQU, // 28: compare equal
WLC_OBJ_COMP_NOTEQU, // 28: compare not equal WLC_OBJ_COMP_NOTEQU, // 29: compare not equal
WLC_OBJ_COMP_LESS, // 29: compare less WLC_OBJ_COMP_LESS, // 30: compare less
WLC_OBJ_COMP_MORE, // 30: compare more WLC_OBJ_COMP_MORE, // 31: compare more
WLC_OBJ_COMP_LESSEQU, // 31: compare less or equal WLC_OBJ_COMP_LESSEQU, // 32: compare less or equal
WLC_OBJ_COMP_MOREEQU, // 32: compare more or equal WLC_OBJ_COMP_MOREEQU, // 33: compare more or equal
WLC_OBJ_REDUCT_AND, // 33: reduction AND WLC_OBJ_REDUCT_AND, // 34: reduction AND
WLC_OBJ_REDUCT_OR, // 34: reduction OR WLC_OBJ_REDUCT_OR, // 35: reduction OR
WLC_OBJ_REDUCT_XOR, // 35: reduction XOR WLC_OBJ_REDUCT_XOR, // 36: reduction XOR
WLC_OBJ_ARI_ADD, // 36: arithmetic addition WLC_OBJ_ARI_ADD, // 37: arithmetic addition
WLC_OBJ_ARI_SUB, // 37: arithmetic subtraction WLC_OBJ_ARI_SUB, // 38: arithmetic subtraction
WLC_OBJ_ARI_MULTI, // 38: arithmetic multiplier WLC_OBJ_ARI_MULTI, // 39: arithmetic multiplier
WLC_OBJ_ARI_DIVIDE, // 39: arithmetic division WLC_OBJ_ARI_DIVIDE, // 40: arithmetic division
WLC_OBJ_ARI_MODULUS, // 40: arithmetic modulus WLC_OBJ_ARI_MODULUS, // 41: arithmetic modulus
WLC_OBJ_ARI_POWER, // 41: arithmetic power WLC_OBJ_ARI_POWER, // 42: arithmetic power
WLC_OBJ_ARI_MINUS, // 42: arithmetic minus WLC_OBJ_ARI_MINUS, // 43: arithmetic minus
WLC_OBJ_TABLE, // 43: bit table WLC_OBJ_TABLE, // 44: bit table
WLC_OBJ_NUMBER // 44: unused WLC_OBJ_NUMBER // 45: unused
} Wlc_ObjType_t; } Wlc_ObjType_t;
......
src/base/wlc/wlcNtk.c
...@@ -56,24 +56,25 @@ static char * Wlc_Names[WLC_OBJ_NUMBER+1] = { ...@@ -56,24 +56,25 @@ static char * Wlc_Names[WLC_OBJ_NUMBER+1] = {
"!", // 23: logic NOT "!", // 23: logic NOT
"&&", // 24: logic AND "&&", // 24: logic AND
"||", // 25: logic OR "||", // 25: logic OR
"==", // 26: compare equal "^^", // 27: logic XOR
"!=", // 27: compare not equal "==", // 28: compare equal
"<", // 28: compare less "!=", // 29: compare not equal
">", // 29: compare more "<", // 30: compare less
"<=", // 30: compare less or equal ">", // 31: compare more
">=", // 31: compare more or equal "<=", // 32: compare less or equal
"&", // 32: reduction AND ">=", // 33: compare more or equal
"|", // 33: reduction OR "&", // 34: reduction AND
"^", // 34: reduction XOR "|", // 35: reduction OR
"+", // 35: arithmetic addition "^", // 36: reduction XOR
"-", // 36: arithmetic subtraction "+", // 37: arithmetic addition
"*", // 37: arithmetic multiplier "-", // 38: arithmetic subtraction
"//", // 38: arithmetic division "*", // 39: arithmetic multiplier
"%", // 39: arithmetic modulus "/", // 40: arithmetic division
"**", // 40: arithmetic power "%", // 41: arithmetic modulus
"-", // 41: arithmetic minus "**", // 42: arithmetic power
"table", // 42: bit table "-", // 43: arithmetic minus
NULL // 43: unused "table", // 44: bit table
NULL // 45: unused
}; };
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment