From cc708b1ccc0048366addcbb8b3b5d10a156b5117 Mon Sep 17 00:00:00 2001 From: cnc Date: Tue, 2 Jun 2026 17:55:14 +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=20O-word=20=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E9=94=99=E8=AF=AF=E6=BA=90=E7=A0=81=E8=A6=86=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 结论：新增重复/未匹配 O-word label 和 out-of-context return/endsub 的 source-link 断言；依据 LinuxCNC interp_o_word.cc，未扩展 smoke。 --- docs/linuxcnc-porting.md | 2 +- test-linuxcnc-source-link.sh | 22 +++++++++++++++++++ ...xcnc_oword_break_undefined_label_error.ngc | 1 + ...inuxcnc_oword_duplicate_if_label_error.ngc | 4 ++++ ...cnc_oword_elseif_undefined_label_error.ngc | 1 + ...ord_endrepeat_no_matching_repeat_error.ngc | 2 ++ ...inuxcnc_oword_endsub_without_sub_error.ngc | 1 + ...inuxcnc_oword_return_without_sub_error.ngc | 1 + 8 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 tests/gcode/linuxcnc_oword_break_undefined_label_error.ngc create mode 100644 tests/gcode/linuxcnc_oword_duplicate_if_label_error.ngc create mode 100644 tests/gcode/linuxcnc_oword_elseif_undefined_label_error.ngc create mode 100644 tests/gcode/linuxcnc_oword_endrepeat_no_matching_repeat_error.ngc create mode 100644 tests/gcode/linuxcnc_oword_endsub_without_sub_error.ngc create mode 100644 tests/gcode/linuxcnc_oword_return_without_sub_error.ngc diff --git a/docs/linuxcnc-porting.md b/docs/linuxcnc-porting.md index 9ba0aa1..a199928 100644 --- a/docs/linuxcnc-porting.md +++ b/docs/linuxcnc-porting.md @@ -211,7 +211,7 @@ This matrix tracks LinuxCNC feature coverage for the web/WASM simulator. A featu | Coordinate offset Canon events `G10 L2`, `G10 L20`, `G10 P0 active-system targeting`, `G54`-`G59.3` selection, `G52`, `G92/G92.1/G92.2/G92.3` | covered through LinuxCNC native/source backends, including all nine G5X indices | `tests/gcode/linuxcnc_coordinate_offsets.ngc`, `tests/gcode/linuxcnc_coordinate_l20.ngc`, `tests/gcode/linuxcnc_coordinate_p0.ngc`, `tests/gcode/linuxcnc_coordinate_select_all.ngc`, `tests/gcode/linuxcnc_g92_restore.ngc`, `tests/gcode/linuxcnc_g52_offset.ngc` | | 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; source-linked read-stage errors cover malformed O-word commands, missing control-expression brackets, too many call parameters, and Fanuc-style `M98` missing `P`; 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`, `tests/gcode/linuxcnc_oword_unknown_command_error.ngc`, `tests/gcode/linuxcnc_oword_unexpected_trailing_item_error.ngc`, `tests/gcode/linuxcnc_oword_if_missing_bracket_error.ngc`, `tests/gcode/linuxcnc_oword_elseif_missing_bracket_error.ngc`, `tests/gcode/linuxcnc_oword_while_missing_bracket_error.ngc`, `tests/gcode/linuxcnc_oword_repeat_missing_bracket_error.ngc`, `tests/gcode/linuxcnc_oword_too_many_call_parameters_error.ngc`, `tests/gcode/linuxcnc_m98_missing_p_word_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; source-linked read/execution errors cover malformed O-word commands, missing control-expression brackets, duplicate/unmatched labels, out-of-context `return`/`endsub`, too many call parameters, and Fanuc-style `M98` missing `P`; 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`, `tests/gcode/linuxcnc_oword_unknown_command_error.ngc`, `tests/gcode/linuxcnc_oword_unexpected_trailing_item_error.ngc`, `tests/gcode/linuxcnc_oword_if_missing_bracket_error.ngc`, `tests/gcode/linuxcnc_oword_elseif_missing_bracket_error.ngc`, `tests/gcode/linuxcnc_oword_while_missing_bracket_error.ngc`, `tests/gcode/linuxcnc_oword_repeat_missing_bracket_error.ngc`, `tests/gcode/linuxcnc_oword_too_many_call_parameters_error.ngc`, `tests/gcode/linuxcnc_oword_endsub_without_sub_error.ngc`, `tests/gcode/linuxcnc_oword_return_without_sub_error.ngc`, `tests/gcode/linuxcnc_oword_duplicate_if_label_error.ngc`, `tests/gcode/linuxcnc_oword_elseif_undefined_label_error.ngc`, `tests/gcode/linuxcnc_oword_break_undefined_label_error.ngc`, `tests/gcode/linuxcnc_oword_endrepeat_no_matching_repeat_error.ngc`, `tests/gcode/linuxcnc_m98_missing_p_word_error.ngc` | | Parameter expressions and operators | covered for parameter references, source-linked `mod`, `**`, logical, and relational operator precedence, plus LinuxCNC parameter-setting syntax, parameter index validation, named-parameter termination, real-number parsing, divide-by-zero, negative sqrt/power, infinity rejection, 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_parameter_number_out_of_range_error.ngc`, `tests/gcode/linuxcnc_parameter_reference_out_of_range_error.ngc`, `tests/gcode/linuxcnc_non_integer_parameter_index_error.ngc`, `tests/gcode/linuxcnc_named_parameter_not_terminated_error.ngc`, `tests/gcode/linuxcnc_no_real_value_error.ngc`, `tests/gcode/linuxcnc_bad_number_format_error.ngc`, `tests/gcode/linuxcnc_expression_operators.ngc`, `tests/gcode/linuxcnc_negative_sqrt_error.ngc`, `tests/gcode/linuxcnc_divide_by_zero_error.ngc`, `tests/gcode/linuxcnc_negative_power_error.ngc`, `tests/gcode/linuxcnc_infinite_expression_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` | diff --git a/test-linuxcnc-source-link.sh b/test-linuxcnc-source-link.sh index 780a110..55a96f5 100755 --- a/test-linuxcnc-source-link.sh +++ b/test-linuxcnc-source-link.sh @@ -893,6 +893,28 @@ for case in "${oword_reader_error_cases[@]}"; do fi grep -q "$expected" "$output_dir/cnc_sim_linuxcnc_source_$fixture.err" done +# Source basis: LinuxCNC src/emc/rs274ngc/interp_o_word.cc +# convert_control_functions() rejects unmatched, duplicate, and +# out-of-context O-word control labels during execution. +oword_execution_error_cases=( + "linuxcnc_oword_endsub_without_sub_error|not in a subroutine definition" + "linuxcnc_oword_return_without_sub_error|not in a subroutine definition" + "linuxcnc_oword_duplicate_if_label_error|duplicate O-word label" + "linuxcnc_oword_elseif_undefined_label_error|undefined O-word label" + "linuxcnc_oword_break_undefined_label_error|undefined O-word label" + "linuxcnc_oword_endrepeat_no_matching_repeat_error|no matching label" +) +for case in "${oword_execution_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 read_text() # rejects EOF without the matching percent/program end and overlong file # lines; read_n_number() rejects malformed N-line numbers through diff --git a/tests/gcode/linuxcnc_oword_break_undefined_label_error.ngc b/tests/gcode/linuxcnc_oword_break_undefined_label_error.ngc new file mode 100644 index 0000000..1fdd2b0 --- /dev/null +++ b/tests/gcode/linuxcnc_oword_break_undefined_label_error.ngc @@ -0,0 +1 @@ +O100 break diff --git a/tests/gcode/linuxcnc_oword_duplicate_if_label_error.ngc b/tests/gcode/linuxcnc_oword_duplicate_if_label_error.ngc new file mode 100644 index 0000000..6eb9be1 --- /dev/null +++ b/tests/gcode/linuxcnc_oword_duplicate_if_label_error.ngc @@ -0,0 +1,4 @@ +O100 if [1] +O100 endif +O100 if [1] +O100 endif diff --git a/tests/gcode/linuxcnc_oword_elseif_undefined_label_error.ngc b/tests/gcode/linuxcnc_oword_elseif_undefined_label_error.ngc new file mode 100644 index 0000000..1df9c09 --- /dev/null +++ b/tests/gcode/linuxcnc_oword_elseif_undefined_label_error.ngc @@ -0,0 +1 @@ +O100 elseif [1] diff --git a/tests/gcode/linuxcnc_oword_endrepeat_no_matching_repeat_error.ngc b/tests/gcode/linuxcnc_oword_endrepeat_no_matching_repeat_error.ngc new file mode 100644 index 0000000..daa6191 --- /dev/null +++ b/tests/gcode/linuxcnc_oword_endrepeat_no_matching_repeat_error.ngc @@ -0,0 +1,2 @@ +O100 if [1] +O100 endrepeat diff --git a/tests/gcode/linuxcnc_oword_endsub_without_sub_error.ngc b/tests/gcode/linuxcnc_oword_endsub_without_sub_error.ngc new file mode 100644 index 0000000..c59b613 --- /dev/null +++ b/tests/gcode/linuxcnc_oword_endsub_without_sub_error.ngc @@ -0,0 +1 @@ +O100 endsub diff --git a/tests/gcode/linuxcnc_oword_return_without_sub_error.ngc b/tests/gcode/linuxcnc_oword_return_without_sub_error.ngc new file mode 100644 index 0000000..11628e3 --- /dev/null +++ b/tests/gcode/linuxcnc_oword_return_without_sub_error.ngc @@ -0,0 +1 @@ +O100 return