From e0bf13622b0922252439e3fa8b43df9877678d75 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Sun, 25 Oct 2026 02:39:11 +0100 Subject: numbers are separate parser states and there are syntactic octal and hexadecimal constants now * Instead of every digit being a stack-modifying standalone command, there is a single continuous parser state (teco_state_number) now - even though it has certain unique characteristics. They are consequently documented in the ARITHMETICS AND EXPRESSIONS chapter of sciteco(7). * A number will therefore be rubbed out entirely by CTRL+W, including a possible @-modifier. * (!) Spaces within constants are no longer ignored, but will push separate numbers to the stack instead (`1 2 3` pushes 3 numbers). The significance of the `,` operator is thus further reduced. * (!) You can no longer "append" to numbers on the stack as in `Qa001` - this was never actually used and caused more confusion. * (!) Digits outside the current radix are no longer accepted. E.g. digit 2 after `2^R`. This feature was also never used. * (!) Octal constants are supported with leading zeros as in C. This works regardless of the current radix set via `8^R` or `^O`. It remains to see whether this is actually useful or is rather annoying (since every constant beginning with 0 is automatically octal, you cannot left-pad arbitrary numbers with 0). * Hexadecimal constants are supported by at-modifying them as in `@0ff`. They must still begin with a digit 0-9 and since A-F are valid SciTECO commands, you may need additional spaces to separate hexadecimal constants from regular commands as in `@0ff D`. During syntax highlighting the number style is extended back to the at-sign. Note: Hexadecimal constants couldn't have been realized via `16^R` (or some shortcut) since that depends on runtime state, but we must know during parsing whether symbols A-F are part of the number of regular SciTECO commands. * The new hexadecimal constants are used in the color schemes now. Thanks to them, we no longer need workarounds like the "color.rgb" macro. * Since numbers don't have a dedicated terminator character, but any letter may terminate it, the number state must behave similar to a start state. Consequently, hexadecimal constants will currently be auto-case-folded if you enabled this feature. I recommend not to write hex constants in upper-case, though. Perhaps this should be worked around with a custom process_edit_cmd() callback. * Test suite updated --- src/expressions.c | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'src/expressions.c') diff --git a/src/expressions.c b/src/expressions.c index 9561c46..95b1040 100644 --- a/src/expressions.c +++ b/src/expressions.c @@ -134,23 +134,6 @@ teco_expressions_pop_num_calc(teco_int_t *ret, teco_int_t imply, GError **error) return TRUE; } -void -teco_expressions_add_digit(gunichar digit, teco_qreg_t *qreg) -{ - /* - * FIXME: We could just access qreg->integer here since - * we can assume that "^R" is a plain register. - */ - assert(qreg != NULL); - teco_int_t radix = 10; - qreg->vtable->get_integer(qreg, &radix, NULL); - - teco_int_t n = teco_expressions_args() > 0 ? teco_expressions_pop_num(0) : 0; - - /* use g_unichar_digit_value()? */ - teco_expressions_push(n*radix + (n < 0 ? -1 : 1)*((gint)digit - '0')); -} - void teco_expressions_push_op(teco_operator_t op) { -- cgit v1.2.3