diff --git a/docs/linuxcnc-porting.md b/docs/linuxcnc-porting.md index 9f09dda..05ab1b4 100644 --- a/docs/linuxcnc-porting.md +++ b/docs/linuxcnc-porting.md @@ -215,5 +215,6 @@ This matrix tracks LinuxCNC feature coverage for the web/WASM simulator. A featu | 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` | +| Block/item reader validation | source-linked LinuxCNC block reader errors covered for repeated `$`, bad item-start characters, middle-of-line `N` words, and too many M-codes from `interp_read.cc`, `interp_array.cc`, and `interp_check.cc` | `tests/gcode/linuxcnc_multiple_spindle_choice_words_error.ngc`, `tests/gcode/linuxcnc_bad_character_bang_error.ngc`, `tests/gcode/linuxcnc_bad_character_middle_n_word_error.ngc`, `tests/gcode/linuxcnc_too_many_m_codes_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 8303816..c383092 100755 --- a/test-linuxcnc-source-link.sh +++ b/test-linuxcnc-source-link.sh @@ -732,6 +732,44 @@ for case in "${gm_reader_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_dollar() rejects repeated spindle-choice words while filling a block. +if CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$var_file" \ + "$build_dir/linuxcnc_rs274_source_dump" tests/gcode/linuxcnc_multiple_spindle_choice_words_error.ngc \ + >"$output_dir/cnc_sim_linuxcnc_source_multiple_spindle_choice_words_error.json" 2>"$output_dir/cnc_sim_linuxcnc_source_multiple_spindle_choice_words_error.err"; then + echo "expected linuxcnc_multiple_spindle_choice_words_error.ngc to fail" >&2 + exit 1 +fi +grep -Fq "Multiple spindle choice (\$) words on one line" \ + "$output_dir/cnc_sim_linuxcnc_source_multiple_spindle_choice_words_error.err" +# Source basis: LinuxCNC src/emc/rs274ngc/interp_read.cc +# read_one_item() uses the default reader table from interp_array.cc and +# rejects unknown item-start characters, including middle-of-line N words. +bad_character_error_cases=( + "linuxcnc_bad_character_bang_error|Bad character '!' used" + "linuxcnc_bad_character_middle_n_word_error|Bad character 'n' used" +) +for case in "${bad_character_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_check.cc +# check_m_codes() rejects blocks with more than MAX_EMS M-codes. +if CNC_SIM_RS274_FILE_MODE=1 CNC_SIM_RS274_VAR="$var_file" \ + "$build_dir/linuxcnc_rs274_source_dump" tests/gcode/linuxcnc_too_many_m_codes_error.ngc \ + >"$output_dir/cnc_sim_linuxcnc_source_too_many_m_codes_error.json" 2>"$output_dir/cnc_sim_linuxcnc_source_too_many_m_codes_error.err"; then + echo "expected linuxcnc_too_many_m_codes_error.ngc to fail" >&2 + exit 1 +fi +grep -q "Too many m codes on line" \ + "$output_dir/cnc_sim_linuxcnc_source_too_many_m_codes_error.err" +# 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_bad_character_bang_error.ngc b/tests/gcode/linuxcnc_bad_character_bang_error.ngc new file mode 100644 index 0000000..cdf4cb4 --- /dev/null +++ b/tests/gcode/linuxcnc_bad_character_bang_error.ngc @@ -0,0 +1 @@ +! diff --git a/tests/gcode/linuxcnc_bad_character_middle_n_word_error.ngc b/tests/gcode/linuxcnc_bad_character_middle_n_word_error.ngc new file mode 100644 index 0000000..04a757e --- /dev/null +++ b/tests/gcode/linuxcnc_bad_character_middle_n_word_error.ngc @@ -0,0 +1 @@ +G1 N10 X1 F100 diff --git a/tests/gcode/linuxcnc_multiple_spindle_choice_words_error.ngc b/tests/gcode/linuxcnc_multiple_spindle_choice_words_error.ngc new file mode 100644 index 0000000..0b7f47d --- /dev/null +++ b/tests/gcode/linuxcnc_multiple_spindle_choice_words_error.ngc @@ -0,0 +1 @@ +$0 $1 diff --git a/tests/gcode/linuxcnc_too_many_m_codes_error.ngc b/tests/gcode/linuxcnc_too_many_m_codes_error.ngc new file mode 100644 index 0000000..7da82fc --- /dev/null +++ b/tests/gcode/linuxcnc_too_many_m_codes_error.ngc @@ -0,0 +1 @@ +M0 M3 M6 M7 M48