Skip to content

Fix AND and OR operators #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 2, 2025
Merged

Fix AND and OR operators #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d907e8
Fix bitwise and logical AND/OR operators.
kblaschke Jun 30, 2025
fe15d99
Bump projectm-eval version to 1.0.2
kblaschke Jun 30, 2025
9ecc137
Update emscripten workflow
kblaschke Jul 1, 2025
84d25bc
Renamed and/or functions to contain either "bitwise" or "boolean" in …
kblaschke Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build_emscripten.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
- uses: actions/checkout@v4

- name: Setup emsdk
uses: mymindstorm/setup-emsdk@v11
uses: mymindstorm/setup-emsdk@v14
with:
# Make sure to set a version number!
version: 3.1.53
version: 3.1.74
# This is the name of the cache folder.
# The cache folder will be placed in the build directory,
# so make sure it doesn't conflict with anything!
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ if(NOT PROJECTM_EVAL_FLOAT_SIZE EQUAL 8 AND NOT PROJECTM_EVAL_FLOAT_SIZE EQUAL 4
endif()

project(projectm-eval
VERSION 1.0.1
VERSION 1.0.2
LANGUAGES ${LANGUAGES} # Using "enable_language(CXX)" in the test dir will NOT work properly!
)

Expand Down
8 changes: 4 additions & 4 deletions projectm-eval/Compiler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2008,11 +2008,11 @@ YYLTYPE yylloc = yyloc_default;
break;

case 33: /* expression: expression BOOLOR expression */
{ PRJM_EVAL_FUNC2((yyval.expression), "bor", (yyvsp[-2].expression), (yyvsp[0].expression)) }
{ PRJM_EVAL_FUNC2((yyval.expression), "_or", (yyvsp[-2].expression), (yyvsp[0].expression)) }
break;

case 34: /* expression: expression BOOLAND expression */
{ PRJM_EVAL_FUNC2((yyval.expression), "band", (yyvsp[-2].expression), (yyvsp[0].expression)) }
{ PRJM_EVAL_FUNC2((yyval.expression), "_and", (yyvsp[-2].expression), (yyvsp[0].expression)) }
break;

case 35: /* expression: expression '=' expression */
Expand Down Expand Up @@ -2052,11 +2052,11 @@ YYLTYPE yylloc = yyloc_default;
break;

case 44: /* expression: expression '|' expression */
{ PRJM_EVAL_FUNC2((yyval.expression), "bor", (yyvsp[-2].expression), (yyvsp[0].expression)) }
{ PRJM_EVAL_FUNC2((yyval.expression), "/*or*/", (yyvsp[-2].expression), (yyvsp[0].expression)) }
break;

case 45: /* expression: expression '&' expression */
{ PRJM_EVAL_FUNC2((yyval.expression), "band", (yyvsp[-2].expression), (yyvsp[0].expression)) }
{ PRJM_EVAL_FUNC2((yyval.expression), "/*and*/", (yyvsp[-2].expression), (yyvsp[0].expression)) }
break;

case 46: /* expression: '-' expression */
Expand Down
8 changes: 4 additions & 4 deletions projectm-eval/Compiler.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ expression:
| expression[left] '>' expression[right] { PRJM_EVAL_FUNC2($$, "_above", $left, $right) }

/* Boolean operators */
| expression[left] BOOLOR expression[right] { PRJM_EVAL_FUNC2($$, "bor", $left, $right) }
| expression[left] BOOLAND expression[right] { PRJM_EVAL_FUNC2($$, "band", $left, $right) }
| expression[left] BOOLOR expression[right] { PRJM_EVAL_FUNC2($$, "_or", $left, $right) }
| expression[left] BOOLAND expression[right] { PRJM_EVAL_FUNC2($$, "_and", $left, $right) }

/* Assignment operator */
| expression[left] '=' expression[right] { PRJM_EVAL_FUNC2($$, "_set", $left, $right) }
Expand All @@ -164,8 +164,8 @@ expression:
| expression[left] '/' expression[right] { PRJM_EVAL_FUNC2($$, "_div", $left, $right) }
| expression[left] '%' expression[right] { PRJM_EVAL_FUNC2($$, "_mod", $left, $right) }
| expression[left] '^' expression[right] { PRJM_EVAL_FUNC2($$, "pow", $left, $right) }
| expression[left] '|' expression[right] { PRJM_EVAL_FUNC2($$, "bor", $left, $right) }
| expression[left] '&' expression[right] { PRJM_EVAL_FUNC2($$, "band", $left, $right) }
| expression[left] '|' expression[right] { PRJM_EVAL_FUNC2($$, "/*or*/", $left, $right) }
| expression[left] '&' expression[right] { PRJM_EVAL_FUNC2($$, "/*and*/", $left, $right) }

/* Unary operators */
| '-' expression[value] %prec NEG { PRJM_EVAL_FUNC1($$, "_neg", $value) }
Expand Down
4 changes: 2 additions & 2 deletions projectm-eval/Scanner.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1546,11 +1546,11 @@ YY_RULE_SETUP
YY_BREAK
case 37:
YY_RULE_SETUP
{ return '%'; }
{ return '&'; }
YY_BREAK
case 38:
YY_RULE_SETUP
{ return '^'; }
{ return '|'; }
YY_BREAK
case 39:
YY_RULE_SETUP
Expand Down
4 changes: 2 additions & 2 deletions projectm-eval/Scanner.l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ NAME [_a-zA-Z][_a-zA-Z0-9]*
"/" { return '/'; }
"%" { return '%'; }
"^" { return '^'; }
"&" { return '%'; }
"|" { return '^'; }
"&" { return '&'; }
"|" { return '|'; }
"!" { return '!'; }
"=" { return '='; }

Expand Down
210 changes: 121 additions & 89 deletions projectm-eval/TreeFunctions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,83 +18,85 @@
*/
static prjm_eval_function_def_t intrinsic_function_table[] = {
/* Special intrinsic functions. Cannot be used via expression syntax. */
{ "/*const*/", prjm_eval_func_const, 0, true, false },
{ "/*var*/", prjm_eval_func_var, 0, false, false },
{ "/*list*/", prjm_eval_func_execute_list, 1, true, false },

{ "if", prjm_eval_func_if, 3, true, false },
{ "_if", prjm_eval_func_if, 3, true, false },
{ "_and", prjm_eval_func_band_op, 2, true, false },
{ "_or", prjm_eval_func_bor_op, 2, true, false },
{ "loop", prjm_eval_func_execute_loop, 2, true, false },
{ "while", prjm_eval_func_execute_while, 1, true, false },

{ "_not", prjm_eval_func_bnot, 1, true, false },
{ "bnot", prjm_eval_func_bnot, 1, true, false },
{ "_equal", prjm_eval_func_equal, 2, true, false },
{ "equal", prjm_eval_func_equal, 2, true, false },
{ "_noteq", prjm_eval_func_notequal, 2, true, false },
{ "_below", prjm_eval_func_below, 2, true, false },
{ "below", prjm_eval_func_below, 2, true, false },
{ "_above", prjm_eval_func_above, 2, true, false },
{ "above", prjm_eval_func_above, 2, true, false },
{ "_beleq", prjm_eval_func_beloweq, 2, true, false },
{ "_aboeq", prjm_eval_func_aboveeq, 2, true, false },

{ "_set", prjm_eval_func_set, 2, false, true },
{ "assign", prjm_eval_func_set, 2, false, true },
{ "_add", prjm_eval_func_add, 2, true, false },
{ "_sub", prjm_eval_func_sub, 2, true, false },
{ "_mul", prjm_eval_func_mul, 2, true, false },
{ "_div", prjm_eval_func_div, 2, true, false },
{ "_mod", prjm_eval_func_mod, 2, true, false },
{ "_mulop", prjm_eval_func_mulop, 2, false, true },
{ "_divop", prjm_eval_func_divop, 2, false, true },
{ "_orop", prjm_eval_func_orop, 2, false, true },
{ "_andop", prjm_eval_func_andop, 2, false, true },
{ "_addop", prjm_eval_func_addop, 2, false, true },
{ "_subop", prjm_eval_func_subop, 2, false, true },
{ "_modop", prjm_eval_func_modop, 2, false, true },

{ "sin", prjm_eval_func_sin, 1, true, false },
{ "cos", prjm_eval_func_cos, 1, true, false },
{ "tan", prjm_eval_func_tan, 1, true, false },
{ "asin", prjm_eval_func_asin, 1, true, false },
{ "acos", prjm_eval_func_acos, 1, true, false },
{ "atan", prjm_eval_func_atan, 1, true, false },
{ "atan2", prjm_eval_func_atan2, 2, true, false },
{ "sqr", prjm_eval_func_sqr, 1, true, false },
{ "sqrt", prjm_eval_func_sqrt, 1, true, false },
{ "pow", prjm_eval_func_pow, 2, true, false },
{ "_powop", prjm_eval_func_powop, 2, false, true },
{ "exp", prjm_eval_func_exp, 1, true, false },
{ "_neg", prjm_eval_func_neg, 1, true, false },

{ "log", prjm_eval_func_log, 1, true, false },
{ "log10", prjm_eval_func_log10, 1, true, false },
{ "abs", prjm_eval_func_abs, 1, true, false },
{ "min", prjm_eval_func_min, 2, true, false },
{ "max", prjm_eval_func_max, 2, true, false },
{ "sign", prjm_eval_func_sign, 1, true, false },
{ "rand", prjm_eval_func_rand, 1, false, false },
{ "floor", prjm_eval_func_floor, 1, true, false },
{ "int", prjm_eval_func_floor, 1, true, false },
{ "ceil", prjm_eval_func_ceil, 1, true, false },
{ "invsqrt", prjm_eval_func_invsqrt, 1, true, false },
{ "sigmoid", prjm_eval_func_sigmoid, 2, true, false },

{ "band", prjm_eval_func_band_func, 2, true, false },
{ "bor", prjm_eval_func_bor_func, 2, true, false },

{ "exec2", prjm_eval_func_exec2, 2, true, false },
{ "exec3", prjm_eval_func_exec3, 3, true, false },
{ "_mem", prjm_eval_func_mem, 1, false, true },
{ "megabuf", prjm_eval_func_mem, 1, false, true },
{ "_gmem", prjm_eval_func_mem, 1, false, true },
{ "gmegabuf", prjm_eval_func_mem, 1, false, true },
{ "freembuf", prjm_eval_func_freembuf, 1, false, true },
{ "memcpy", prjm_eval_func_memcpy, 3, false, true },
{ "memset", prjm_eval_func_memset, 3, false, true }
{ "/*const*/", prjm_eval_func_const, 0, true, false },
{ "/*var*/", prjm_eval_func_var, 0, false, false },
{ "/*list*/", prjm_eval_func_execute_list, 1, true, false },
{ "/*or*/", prjm_eval_func_bitwise_or, 2, true, false },
{ "/*and*/", prjm_eval_func_bitwise_and, 2, true, false },

{ "if", prjm_eval_func_if, 3, true, false },
{ "_if", prjm_eval_func_if, 3, true, false },
{ "_and", prjm_eval_func_boolean_and_op, 2, true, false },
{ "_or", prjm_eval_func_boolean_or_op, 2, true, false },
{ "loop", prjm_eval_func_execute_loop, 2, true, false },
{ "while", prjm_eval_func_execute_while, 1, true, false },

{ "_not", prjm_eval_func_bnot, 1, true, false },
{ "bnot", prjm_eval_func_bnot, 1, true, false },
{ "_equal", prjm_eval_func_equal, 2, true, false },
{ "equal", prjm_eval_func_equal, 2, true, false },
{ "_noteq", prjm_eval_func_notequal, 2, true, false },
{ "_below", prjm_eval_func_below, 2, true, false },
{ "below", prjm_eval_func_below, 2, true, false },
{ "_above", prjm_eval_func_above, 2, true, false },
{ "above", prjm_eval_func_above, 2, true, false },
{ "_beleq", prjm_eval_func_beloweq, 2, true, false },
{ "_aboeq", prjm_eval_func_aboveeq, 2, true, false },

{ "_set", prjm_eval_func_set, 2, false, true },
{ "assign", prjm_eval_func_set, 2, false, true },
{ "_add", prjm_eval_func_add, 2, true, false },
{ "_sub", prjm_eval_func_sub, 2, true, false },
{ "_mul", prjm_eval_func_mul, 2, true, false },
{ "_div", prjm_eval_func_div, 2, true, false },
{ "_mod", prjm_eval_func_mod, 2, true, false },
{ "_mulop", prjm_eval_func_mul_op, 2, false, true },
{ "_divop", prjm_eval_func_div_op, 2, false, true },
{ "_orop", prjm_eval_func_bitwise_or_op, 2, false, true },
{ "_andop", prjm_eval_func_bitwise_and_op, 2, false, true },
{ "_addop", prjm_eval_func_add_op, 2, false, true },
{ "_subop", prjm_eval_func_sub_op, 2, false, true },
{ "_modop", prjm_eval_func_mod_op, 2, false, true },

{ "sin", prjm_eval_func_sin, 1, true, false },
{ "cos", prjm_eval_func_cos, 1, true, false },
{ "tan", prjm_eval_func_tan, 1, true, false },
{ "asin", prjm_eval_func_asin, 1, true, false },
{ "acos", prjm_eval_func_acos, 1, true, false },
{ "atan", prjm_eval_func_atan, 1, true, false },
{ "atan2", prjm_eval_func_atan2, 2, true, false },
{ "sqr", prjm_eval_func_sqr, 1, true, false },
{ "sqrt", prjm_eval_func_sqrt, 1, true, false },
{ "pow", prjm_eval_func_pow, 2, true, false },
{ "_powop", prjm_eval_func_pow_op, 2, false, true },
{ "exp", prjm_eval_func_exp, 1, true, false },
{ "_neg", prjm_eval_func_neg, 1, true, false },

{ "log", prjm_eval_func_log, 1, true, false },
{ "log10", prjm_eval_func_log10, 1, true, false },
{ "abs", prjm_eval_func_abs, 1, true, false },
{ "min", prjm_eval_func_min, 2, true, false },
{ "max", prjm_eval_func_max, 2, true, false },
{ "sign", prjm_eval_func_sign, 1, true, false },
{ "rand", prjm_eval_func_rand, 1, false, false },
{ "floor", prjm_eval_func_floor, 1, true, false },
{ "int", prjm_eval_func_floor, 1, true, false },
{ "ceil", prjm_eval_func_ceil, 1, true, false },
{ "invsqrt", prjm_eval_func_invsqrt, 1, true, false },
{ "sigmoid", prjm_eval_func_sigmoid, 2, true, false },

{ "band", prjm_eval_func_boolean_and_func, 2, true, false },
{ "bor", prjm_eval_func_boolean_or_func, 2, true, false },

{ "exec2", prjm_eval_func_exec2, 2, true, false },
{ "exec3", prjm_eval_func_exec3, 3, true, false },
{ "_mem", prjm_eval_func_mem, 1, false, true },
{ "megabuf", prjm_eval_func_mem, 1, false, true },
{ "_gmem", prjm_eval_func_mem, 1, false, true },
{ "gmegabuf", prjm_eval_func_mem, 1, false, true },
{ "freembuf", prjm_eval_func_freembuf, 1, false, true },
{ "memcpy", prjm_eval_func_memcpy, 3, false, true },
{ "memset", prjm_eval_func_memset, 3, false, true }
};


Expand Down Expand Up @@ -608,7 +610,7 @@ prjm_eval_function_decl(mod)
assign_ret_val((PRJM_EVAL_F) ((int) *val1_ptr % divisor));
}

prjm_eval_function_decl(band_op)
prjm_eval_function_decl(boolean_and_op)
{
assert_valid_ctx();

Expand All @@ -635,7 +637,7 @@ prjm_eval_function_decl(band_op)
}
}

prjm_eval_function_decl(bor_op)
prjm_eval_function_decl(boolean_or_op)
{
assert_valid_ctx();

Expand All @@ -662,7 +664,7 @@ prjm_eval_function_decl(bor_op)
}
}

prjm_eval_function_decl(band_func)
prjm_eval_function_decl(boolean_and_func)
{
assert_valid_ctx();

Expand All @@ -678,7 +680,7 @@ prjm_eval_function_decl(band_func)
assign_ret_val(fabs(*val1_ptr) > close_factor && fabs(*val2_ptr) > close_factor ? 1.0 : 0.0);
}

prjm_eval_function_decl(bor_func)
prjm_eval_function_decl(boolean_or_func)
{
assert_valid_ctx();

Expand Down Expand Up @@ -706,7 +708,7 @@ prjm_eval_function_decl(neg)
assign_ret_val(-(*val1_ptr));
}

prjm_eval_function_decl(addop)
prjm_eval_function_decl(add_op)
{
assert_valid_ctx();

Expand All @@ -719,7 +721,7 @@ prjm_eval_function_decl(addop)
assign_ret_val(**ret_val + *val2_ptr);
}

prjm_eval_function_decl(subop)
prjm_eval_function_decl(sub_op)
{
assert_valid_ctx();

Expand All @@ -732,7 +734,7 @@ prjm_eval_function_decl(subop)
assign_ret_val(**ret_val - *val2_ptr);
}

prjm_eval_function_decl(mulop)
prjm_eval_function_decl(mul_op)
{
assert_valid_ctx();

Expand All @@ -745,7 +747,7 @@ prjm_eval_function_decl(mulop)
assign_ret_val(**ret_val * *val2_ptr);
}

prjm_eval_function_decl(divop)
prjm_eval_function_decl(div_op)
{
assert_valid_ctx();

Expand All @@ -764,7 +766,7 @@ prjm_eval_function_decl(divop)
assign_ret_val(**ret_val / *val2_ptr);
}

prjm_eval_function_decl(orop)
prjm_eval_function_decl(bitwise_or_op)
{
assert_valid_ctx();

Expand All @@ -777,7 +779,22 @@ prjm_eval_function_decl(orop)
assign_ret_val((PRJM_EVAL_F) ((int)(**ret_val) | (int)(*val2_ptr)));
}

prjm_eval_function_decl(andop)
prjm_eval_function_decl(bitwise_or)
{
assert_valid_ctx();

PRJM_EVAL_F val1 = .0;
PRJM_EVAL_F* val1_ptr = &val1;
PRJM_EVAL_F val2 = .0;
PRJM_EVAL_F* val2_ptr = &val2;

invoke_arg(0, &val1_ptr);
invoke_arg(1, &val2_ptr);

assign_ret_val((PRJM_EVAL_F) ((int)(*val1_ptr) | (int)(*val2_ptr)));
}

prjm_eval_function_decl(bitwise_and_op)
{
assert_valid_ctx();

Expand All @@ -790,7 +807,22 @@ prjm_eval_function_decl(andop)
assign_ret_val((PRJM_EVAL_F) ((int)(**ret_val) & (int)(*val2_ptr)));
}

prjm_eval_function_decl(modop)
prjm_eval_function_decl(bitwise_and)
{
assert_valid_ctx();

PRJM_EVAL_F val1 = .0;
PRJM_EVAL_F* val1_ptr = &val1;
PRJM_EVAL_F val2 = .0;
PRJM_EVAL_F* val2_ptr = &val2;

invoke_arg(0, &val1_ptr);
invoke_arg(1, &val2_ptr);

assign_ret_val((PRJM_EVAL_F) ((int)(*val1_ptr) & (int)(*val2_ptr)));
}

prjm_eval_function_decl(mod_op)
{
assert_valid_ctx();

Expand All @@ -809,7 +841,7 @@ prjm_eval_function_decl(modop)
assign_ret_val((PRJM_EVAL_F) ((int)(**ret_val) % divisor));
}

prjm_eval_function_decl(powop)
prjm_eval_function_decl(pow_op)
{
assert_valid_ctx();

Expand Down
Loading
Loading