继续按 align-linuxcnc 约束：补齐 read_operation 源码错误覆盖
结论：覆盖 LinuxCNC interp_read.cc read_operation() 的未知二元操作名前缀、未知操作字符和未闭合表达式错误；未扩展 smoke。 验证：./test-native.sh；./test-linuxcnc-source-link.sh。
This commit is contained in:
cnc
@@ -212,6 +212,6 @@ This matrix tracks LinuxCNC feature coverage for the web/WASM simulator. A featu
|
||||
| Cutter compensation | covered for tool-table `G41/G42 D...` and explicit-radius `G41.1/G42.1/G40` through LinuxCNC native/source backends | `tests/gcode/linuxcnc_cutter_comp.ngc` |
|
||||
| Probe moves `G38.2/G38.3/G38.4/G38.5` | covered as distinct probe events with LinuxCNC `probe_type` preserved through smoke, native, and source-linked paths | `tests/gcode/linuxcnc_probe_no_error.ngc` |
|
||||
| O-word subroutines, calls, and control flow | covered for numeric and named `O... sub/call/return/endsub` plus `if`/`elseif`/`else`, `while`, `repeat`, `do`/`while`, `break`, and `continue` through LinuxCNC file mode; smoke parser also covers named `O<name>` sub/call/return/endsub and loop-control forms | `tests/gcode/smoke_oword_subprogram.ngc`, `tests/gcode/linuxcnc_named_oword_subprogram.ngc`, `tests/gcode/linuxcnc_oword_control_flow.ngc` |
|
||||
| Parameter expressions and operators | covered for parameter references, source-linked `mod`, `**`, logical, and relational operator precedence, plus LinuxCNC divide-by-zero, negative-power, malformed `ATAN[]/[]`, and unary operation error paths from `interp_read.cc`/`interp_execute.cc` | `tests/gcode/linuxcnc_parameter_expression_assignment.ngc`, `tests/gcode/linuxcnc_expression_operators.ngc`, `tests/gcode/linuxcnc_divide_by_zero_error.ngc`, `tests/gcode/linuxcnc_negative_power_error.ngc`, `tests/gcode/linuxcnc_atan_missing_slash_error.ngc`, `tests/gcode/linuxcnc_atan_missing_bracket_error.ngc`, `tests/gcode/linuxcnc_unary_missing_bracket_error.ngc`, `tests/gcode/linuxcnc_unary_unknown_word_error.ngc` |
|
||||
| Parameter expressions and operators | covered for parameter references, source-linked `mod`, `**`, logical, and relational operator precedence, plus LinuxCNC divide-by-zero, negative-power, malformed `ATAN[]/[]`, unary operation, `read_operation()` binary-operation prefix, unknown operation, and unclosed-expression error paths from `interp_read.cc`/`interp_execute.cc` | `tests/gcode/linuxcnc_parameter_expression_assignment.ngc`, `tests/gcode/linuxcnc_expression_operators.ngc`, `tests/gcode/linuxcnc_divide_by_zero_error.ngc`, `tests/gcode/linuxcnc_negative_power_error.ngc`, `tests/gcode/linuxcnc_atan_missing_slash_error.ngc`, `tests/gcode/linuxcnc_atan_missing_bracket_error.ngc`, `tests/gcode/linuxcnc_unary_missing_bracket_error.ngc`, `tests/gcode/linuxcnc_unary_unknown_word_error.ngc`, `tests/gcode/linuxcnc_binary_unknown_a_operation_error.ngc`, `tests/gcode/linuxcnc_binary_unknown_e_operation_error.ngc`, `tests/gcode/linuxcnc_binary_unknown_g_operation_error.ngc`, `tests/gcode/linuxcnc_binary_unknown_l_operation_error.ngc`, `tests/gcode/linuxcnc_binary_unknown_m_operation_error.ngc`, `tests/gcode/linuxcnc_binary_unknown_n_operation_error.ngc`, `tests/gcode/linuxcnc_binary_unknown_o_operation_error.ngc`, `tests/gcode/linuxcnc_binary_unknown_x_operation_error.ngc`, `tests/gcode/linuxcnc_binary_unknown_operation_error.ngc`, `tests/gcode/linuxcnc_unclosed_expression_error.ngc` |
|
||||
| Broader canned cycles `G73`, `G74`, `G82`-`G89` | partially covered: `G73`, `G74`, `G82`, `G83`, `G84`, `G85`, `G86`, `G87`, `G88`, `G89`; smoke parser maps supported cycles across `G17/G18/G19`, including LinuxCNC's special non-XY `G74/G84` tapping argument order and `G87` plane-specific `I/J/K` mapping; native/source regressions now check non-XY `G74/G84/G86/G87/G88` sequences | `tests/gcode/linuxcnc_canned_cycles_extended.ngc`, `tests/gcode/linuxcnc_canned_cycle_planes.ngc`, smoke API regression |
|
||||
| Full source-level wasm build | covered for the current wasm-safe RS274 source set, with remaining work focused on broadening browser-hostile dependency replacement and feature coverage | `./build-wasm.sh`, `test-linuxcnc-wasm-runtime-link.sh`, `test-web-wasm-node-smoke.sh`, `test-web-wasm-browser-smoke.sh` |
|
||||
|
||||
@@ -627,6 +627,33 @@ if CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$var_file" \
|
||||
fi
|
||||
grep -q "Unknown word starting with a" \
|
||||
"$output_dir/cnc_sim_linuxcnc_source_unary_unknown_word_error.err"
|
||||
# Source basis: LinuxCNC src/emc/rs274ngc/interp_read.cc
|
||||
# read_operation() rejects unknown binary operation names by prefix,
|
||||
# unknown operation characters, and expressions that reach end-of-line
|
||||
# before a right bracket.
|
||||
binary_operation_error_cases=(
|
||||
"linuxcnc_binary_unknown_a_operation_error|Unknown operation name starting with a"
|
||||
"linuxcnc_binary_unknown_e_operation_error|Unknown operation name starting with e"
|
||||
"linuxcnc_binary_unknown_g_operation_error|Unknown operation name starting with g"
|
||||
"linuxcnc_binary_unknown_l_operation_error|Unknown operation name starting with l"
|
||||
"linuxcnc_binary_unknown_m_operation_error|Unknown operation name starting with m"
|
||||
"linuxcnc_binary_unknown_n_operation_error|Unknown operation name starting with n"
|
||||
"linuxcnc_binary_unknown_o_operation_error|Unknown operation name starting with o"
|
||||
"linuxcnc_binary_unknown_x_operation_error|Unknown operation name starting with x"
|
||||
"linuxcnc_binary_unknown_operation_error|Unknown operation"
|
||||
"linuxcnc_unclosed_expression_error|Unclosed expression"
|
||||
)
|
||||
for case in "${binary_operation_error_cases[@]}"; do
|
||||
fixture=${case%%|*}
|
||||
expected=${case#*|}
|
||||
if CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$var_file" \
|
||||
"$build_dir/linuxcnc_rs274_source_dump" "tests/gcode/$fixture.ngc" \
|
||||
>"$output_dir/cnc_sim_linuxcnc_source_$fixture.json" 2>"$output_dir/cnc_sim_linuxcnc_source_$fixture.err"; then
|
||||
echo "expected $fixture.ngc to fail" >&2
|
||||
exit 1
|
||||
fi
|
||||
grep -q "$expected" "$output_dir/cnc_sim_linuxcnc_source_$fixture.err"
|
||||
done
|
||||
CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$var_file" \
|
||||
"$build_dir/linuxcnc_rs274_source_dump" tests/gcode/linuxcnc_value_returned.ngc \
|
||||
>"$output_dir/cnc_sim_linuxcnc_source_value_returned.json"
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
#1 = [1 aaz 2]
|
||||
G1 X#1 F100
|
||||
@@ -0,0 +1,2 @@
|
||||
#1 = [1 ez 2]
|
||||
G1 X#1 F100
|
||||
@@ -0,0 +1,2 @@
|
||||
#1 = [1 gz 2]
|
||||
G1 X#1 F100
|
||||
@@ -0,0 +1,2 @@
|
||||
#1 = [1 lz 2]
|
||||
G1 X#1 F100
|
||||
@@ -0,0 +1,2 @@
|
||||
#1 = [1 moz 2]
|
||||
G1 X#1 F100
|
||||
@@ -0,0 +1,2 @@
|
||||
#1 = [1 nz 2]
|
||||
G1 X#1 F100
|
||||
@@ -0,0 +1,2 @@
|
||||
#1 = [1 oz 2]
|
||||
G1 X#1 F100
|
||||
2
tests/gcode/linuxcnc_binary_unknown_operation_error.ngc
Normal file
2
tests/gcode/linuxcnc_binary_unknown_operation_error.ngc
Normal file
@@ -0,0 +1,2 @@
|
||||
#1 = [1 @ 2]
|
||||
G1 X#1 F100
|
||||
@@ -0,0 +1,2 @@
|
||||
#1 = [1 xaz 2]
|
||||
G1 X#1 F100
|
||||
2
tests/gcode/linuxcnc_unclosed_expression_error.ngc
Normal file
2
tests/gcode/linuxcnc_unclosed_expression_error.ngc
Normal file
@@ -0,0 +1,2 @@
|
||||
#1 = [1 + 2
|
||||
G1 X#1 F100
|
||||
Reference in New Issue
Block a user