From b83bc47c45317710e1d8aed78cce9c48913b6456 Mon Sep 17 00:00:00 2001 From: cnc Date: Tue, 2 Jun 2026 16:35:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E6=8C=89=20align-linuxcnc=20?= =?UTF-8?q?=E7=BA=A6=E6=9D=9F=EF=BC=9A=E8=A1=A5=20G/M=20reader=20=E6=BA=90?= =?UTF-8?q?=E7=A0=81=E9=94=99=E8=AF=AF=E8=A6=86=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 结论：覆盖 LinuxCNC interp_read.cc/read_g()/read_m() 的范围、未知代码和同 modal group 冲突错误，代码表依据 interp_array.cc；未扩展 smoke。 验证：./test-linuxcnc-source-link.sh；./test-native.sh。 --- docs/linuxcnc-porting.md | 1 + test-linuxcnc-source-link.sh | 22 +++++++++++++++++++ .../linuxcnc_g_code_out_of_range_error.ngc | 1 + .../linuxcnc_m_code_greater_199_error.ngc | 1 + ...cnc_two_g_codes_same_modal_group_error.ngc | 1 + ...cnc_two_m_codes_same_modal_group_error.ngc | 1 + tests/gcode/linuxcnc_unknown_g_code_error.ngc | 1 + tests/gcode/linuxcnc_unknown_m_code_error.ngc | 1 + 8 files changed, 29 insertions(+) create mode 100644 tests/gcode/linuxcnc_g_code_out_of_range_error.ngc create mode 100644 tests/gcode/linuxcnc_m_code_greater_199_error.ngc create mode 100644 tests/gcode/linuxcnc_two_g_codes_same_modal_group_error.ngc create mode 100644 tests/gcode/linuxcnc_two_m_codes_same_modal_group_error.ngc create mode 100644 tests/gcode/linuxcnc_unknown_g_code_error.ngc create mode 100644 tests/gcode/linuxcnc_unknown_m_code_error.ngc diff --git a/docs/linuxcnc-porting.md b/docs/linuxcnc-porting.md index 73cf2d9..9f09dda 100644 --- a/docs/linuxcnc-porting.md +++ b/docs/linuxcnc-porting.md @@ -214,5 +214,6 @@ This matrix tracks LinuxCNC feature coverage for the web/WASM simulator. A featu | 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` 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 parameter-setting syntax, divide-by-zero, negative-power, malformed `ATAN[]/[]`, unary operation syntax, `read_operation_unary()` unknown-word branches, `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_parameter_missing_equal_error.ngc`, `tests/gcode/linuxcnc_parameter_missing_value_error.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_unary_unknown_c_word_error.ngc`, `tests/gcode/linuxcnc_unary_unknown_e_word_error.ngc`, `tests/gcode/linuxcnc_unary_unknown_f_word_error.ngc`, `tests/gcode/linuxcnc_unary_unknown_l_word_error.ngc`, `tests/gcode/linuxcnc_unary_unknown_r_word_error.ngc`, `tests/gcode/linuxcnc_unary_unknown_s_word_error.ngc`, `tests/gcode/linuxcnc_unary_unknown_t_word_error.ngc`, `tests/gcode/linuxcnc_unary_unknown_default_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` | | Word reader validation | source-linked LinuxCNC reader errors covered for negative `F/G/H/L/M/S/T` values and repeated `A/B/C/D/E/F/H/I/J/K/L/P/Q/R/S/T/U/V/W/X/Y/Z` words from `interp_read.cc` | `tests/gcode/linuxcnc_negative_f_word_error.ngc`, `tests/gcode/linuxcnc_negative_g_code_error.ngc`, `tests/gcode/linuxcnc_negative_h_word_error.ngc`, `tests/gcode/linuxcnc_negative_l_word_error.ngc`, `tests/gcode/linuxcnc_negative_m_code_error.ngc`, `tests/gcode/linuxcnc_negative_s_word_error.ngc`, `tests/gcode/linuxcnc_negative_t_word_error.ngc`, `tests/gcode/linuxcnc_multiple_a_words_error.ngc`, `tests/gcode/linuxcnc_multiple_b_words_error.ngc`, `tests/gcode/linuxcnc_multiple_c_words_error.ngc`, `tests/gcode/linuxcnc_multiple_d_words_error.ngc`, `tests/gcode/linuxcnc_multiple_e_words_error.ngc`, `tests/gcode/linuxcnc_multiple_f_words_error.ngc`, `tests/gcode/linuxcnc_multiple_h_words_error.ngc`, `tests/gcode/linuxcnc_multiple_i_words_error.ngc`, `tests/gcode/linuxcnc_multiple_j_words_error.ngc`, `tests/gcode/linuxcnc_multiple_k_words_error.ngc`, `tests/gcode/linuxcnc_multiple_l_words_error.ngc`, `tests/gcode/linuxcnc_multiple_p_words_error.ngc`, `tests/gcode/linuxcnc_multiple_q_words_error.ngc`, `tests/gcode/linuxcnc_multiple_r_words_error.ngc`, `tests/gcode/linuxcnc_multiple_s_words_error.ngc`, `tests/gcode/linuxcnc_multiple_t_words_error.ngc`, `tests/gcode/linuxcnc_multiple_u_words_error.ngc`, `tests/gcode/linuxcnc_multiple_v_words_error.ngc`, `tests/gcode/linuxcnc_multiple_w_words_error.ngc`, `tests/gcode/linuxcnc_multiple_x_words_error.ngc`, `tests/gcode/linuxcnc_multiple_y_words_error.ngc`, `tests/gcode/linuxcnc_multiple_z_words_error.ngc` | +| G/M reader validation | source-linked LinuxCNC `read_g()`/`read_m()` errors covered for range checks, unknown code tables, and same-modal-group conflicts from `interp_read.cc` and `interp_array.cc` | `tests/gcode/linuxcnc_g_code_out_of_range_error.ngc`, `tests/gcode/linuxcnc_unknown_g_code_error.ngc`, `tests/gcode/linuxcnc_two_g_codes_same_modal_group_error.ngc`, `tests/gcode/linuxcnc_m_code_greater_199_error.ngc`, `tests/gcode/linuxcnc_unknown_m_code_error.ngc`, `tests/gcode/linuxcnc_two_m_codes_same_modal_group_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` | diff --git a/test-linuxcnc-source-link.sh b/test-linuxcnc-source-link.sh index 6fac6a7..8303816 100755 --- a/test-linuxcnc-source-link.sh +++ b/test-linuxcnc-source-link.sh @@ -710,6 +710,28 @@ for case in "${negative_word_error_cases[@]}"; do grep -q "$expected" "$output_dir/cnc_sim_linuxcnc_source_$fixture.err" done # Source basis: LinuxCNC src/emc/rs274ngc/interp_read.cc +# read_g()/read_m() validate numeric range, known code tables from +# interp_array.cc, and same-modal-group conflicts while filling a block. +gm_reader_error_cases=( + "linuxcnc_g_code_out_of_range_error|G-code out of range" + "linuxcnc_unknown_g_code_error|Unknown g code used" + "linuxcnc_two_g_codes_same_modal_group_error|Two g codes used from same modal group" + "linuxcnc_m_code_greater_199_error|M-code greater than 199: M200" + "linuxcnc_unknown_m_code_error|Unknown m code used: M13" + "linuxcnc_two_m_codes_same_modal_group_error|Two m codes used from same modal group" +) +for case in "${gm_reader_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 +# Source basis: LinuxCNC src/emc/rs274ngc/interp_read.cc # the word-specific reader functions reject repeated words while # filling a single block. multiple_word_error_cases=( diff --git a/tests/gcode/linuxcnc_g_code_out_of_range_error.ngc b/tests/gcode/linuxcnc_g_code_out_of_range_error.ngc new file mode 100644 index 0000000..ae9dc3e --- /dev/null +++ b/tests/gcode/linuxcnc_g_code_out_of_range_error.ngc @@ -0,0 +1 @@ +G999.2 diff --git a/tests/gcode/linuxcnc_m_code_greater_199_error.ngc b/tests/gcode/linuxcnc_m_code_greater_199_error.ngc new file mode 100644 index 0000000..c3a14b3 --- /dev/null +++ b/tests/gcode/linuxcnc_m_code_greater_199_error.ngc @@ -0,0 +1 @@ +M200 diff --git a/tests/gcode/linuxcnc_two_g_codes_same_modal_group_error.ngc b/tests/gcode/linuxcnc_two_g_codes_same_modal_group_error.ngc new file mode 100644 index 0000000..a371e8a --- /dev/null +++ b/tests/gcode/linuxcnc_two_g_codes_same_modal_group_error.ngc @@ -0,0 +1 @@ +G0 G1 X1 F100 diff --git a/tests/gcode/linuxcnc_two_m_codes_same_modal_group_error.ngc b/tests/gcode/linuxcnc_two_m_codes_same_modal_group_error.ngc new file mode 100644 index 0000000..a1f5a25 --- /dev/null +++ b/tests/gcode/linuxcnc_two_m_codes_same_modal_group_error.ngc @@ -0,0 +1 @@ +M3 M4 S100 diff --git a/tests/gcode/linuxcnc_unknown_g_code_error.ngc b/tests/gcode/linuxcnc_unknown_g_code_error.ngc new file mode 100644 index 0000000..5a08b28 --- /dev/null +++ b/tests/gcode/linuxcnc_unknown_g_code_error.ngc @@ -0,0 +1 @@ +G13 diff --git a/tests/gcode/linuxcnc_unknown_m_code_error.ngc b/tests/gcode/linuxcnc_unknown_m_code_error.ngc new file mode 100644 index 0000000..af139e6 --- /dev/null +++ b/tests/gcode/linuxcnc_unknown_m_code_error.ngc @@ -0,0 +1 @@ +M13