Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into TUI
Browse files Browse the repository at this point in the history
# Conflicts:
#	modules/view/VID.red
#	runtime/definitions.reds
  • Loading branch information
qtxie committed May 20, 2024
2 parents 35c891f + 504903d commit 6843ae1
Show file tree
Hide file tree
Showing 111 changed files with 2,638 additions and 1,532 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/RPi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Build RPi Tests
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build Red Tests
uses: ./CI/Linux-32
Expand All @@ -20,13 +20,13 @@ jobs:
with:
command: rebol -qws system/tests/build-arm-tests.r -t RPi

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: rpi-tests-bin
path: quick-test/runnable/arm-tests/red
retention-days: 3

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: rpi-rs-bin
path: quick-test/runnable/arm-tests/system
Expand All @@ -44,7 +44,7 @@ jobs:
rm -rf ${{ github.workspace }}/*
- name: Retrieve tests
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: rpi-rs-bin

Expand All @@ -55,7 +55,7 @@ jobs:
./run-all.sh
# upload log file if any test failed
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: RS-Tests-Armbian-log
Expand All @@ -73,7 +73,7 @@ jobs:
rm -rf ${{ github.workspace }}/*
- name: Retrieve tests
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: rpi-tests-bin

Expand All @@ -83,7 +83,7 @@ jobs:
./run-all.sh
# upload log file if any test failed
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: Red-Tests-Armbian-log
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ jobs:
name: Run Linux-x86 Tests
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Build Tests
uses: ./CI/Linux-gtk
with:
command: /sbin/start-stop-daemon --start --quiet --background --exec /usr/bin/Xvfb && sleep 3 && rebol -qws tests/run-all.r --batch

# upload log file if any test failed
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: Linux-Red-Tests-log
Expand All @@ -26,14 +26,14 @@ jobs:
name: Run Linux-RS Tests
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Build Tests
uses: ./CI/Linux-32
with:
command: rebol -qws system/tests/run-all.r --batch

# upload log file if any test failed
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: Linux-RS-Tests-log
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/macOS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:
echo "Cleaning up previous run"
rm -rf ${{ github.workspace }}/*
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Run RS tests
run: rebpro -qws system/tests/run-all.r --batch

# upload log file if any test failed
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: RS-Tests-macOS
Expand All @@ -30,7 +30,7 @@ jobs:
run: rebpro -qws tests/run-all.r --batch

# upload log file if any test failed
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: Red-Tests-macOS
Expand All @@ -52,7 +52,7 @@ jobs:
- name: Set env
run: echo "red_toolchain=$(ls red-toolchain-*)" >> "$GITHUB_ENV"

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ env.red_toolchain }}
path: red-toolchain-*
32 changes: 16 additions & 16 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: setup red repo
run: |
$url = "http://static.red-lang.org/build/rebview.exe"
Expand All @@ -18,7 +18,7 @@ jobs:
run: rebview.exe -qws tests\run-core-tests.r --batch
shell: cmd

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: core-test-log
Expand All @@ -29,7 +29,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: setup red repo
run: |
$url = "http://static.red-lang.org/build/rebview.exe"
Expand All @@ -39,7 +39,7 @@ jobs:
run: rebview.exe -qws tests\run-core-tests.r --batch --release
shell: cmd

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: core-test-log
Expand All @@ -50,7 +50,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: setup red repo
run: |
$url = "http://static.red-lang.org/build/rebview.exe"
Expand All @@ -60,7 +60,7 @@ jobs:
run: rebview.exe -qws tests\run-core-tests.r --batch --debug
shell: cmd

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: core-debug-test-log
Expand All @@ -71,7 +71,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: setup red repo
run: |
$url = "http://static.red-lang.org/build/rebview.exe"
Expand All @@ -81,7 +81,7 @@ jobs:
run: rebview.exe -qws tests\run-view-tests.r --batch
shell: cmd

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: view-test-log
Expand All @@ -92,7 +92,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: setup red repo
run: |
$url = "http://static.red-lang.org/build/rebview.exe"
Expand All @@ -102,7 +102,7 @@ jobs:
run: rebview.exe -qws tests\run-regression-tests.r --batch
shell: cmd

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: regression-test-log
Expand All @@ -113,7 +113,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: setup red repo
run: |
$url = "http://static.red-lang.org/build/rebview.exe"
Expand All @@ -123,7 +123,7 @@ jobs:
run: rebview.exe -qws tests\run-core-tests.r --ci-each
shell: cmd

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: each-test-log
Expand All @@ -134,7 +134,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: setup red repo
run: |
$url = "http://static.red-lang.org/build/rebview.exe"
Expand All @@ -144,7 +144,7 @@ jobs:
run: rebview.exe -qws tests\run-core-tests.r --ci-each --debug
shell: cmd

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: each-debug-test-log
Expand All @@ -155,7 +155,7 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: setup red repo
run: |
$url = "http://static.red-lang.org/build/rebview.exe"
Expand All @@ -165,7 +165,7 @@ jobs:
run: rebview.exe -qws system\tests\run-all.r --batch
shell: cmd

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: failure()
with:
name: rs-test-log
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ More information at [red-lang.org](https://www.red-lang.org).

[Download](https://www.red-lang.org/p/download.html) a GUI or CLI console binary suitable for your operating system, rename it at your convenience, then run it from shell or by double-clicking on it (Windows). You should see the following output:

---== Red 0.6.4 ==--
---== Red 0.6.5 ==--
Type HELP for starting information.

>>
Expand Down
2 changes: 1 addition & 1 deletion build/git-version.r
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ context [
if all [system/version/4 = 3 not find get-env "PATH" "git"][return none]

attempt [
temp: parse git "describe --long" "-"
temp: parse git "describe --long --tags" "-"
compose/deep [
context [
branch: (git "rev-parse --abbrev-ref HEAD")
Expand Down
1 change: 1 addition & 0 deletions build/includes.r
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ write %build/bin/sources.r set-cache [
%rules.red
%utils.red
%RTD.red
%styles.red
%VID.red
%backends/ [
%keycodes.reds
Expand Down
5 changes: 3 additions & 2 deletions docs/lexer/lexer-FSM.csv
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ S_HDPER_CL;T_RAWSTRING;T_RAWSTRING;T_ERROR;T_ERROR;T_RAWSTRING;T_RAWSTRING;T_RAW
S_SLASH_1ST;T_WORD;T_WORD;S_SLASH;S_SLASH;T_WORD;T_WORD;T_WORD;T_WORD;T_WORD;T_WORD;T_WORD;T_WORD;S_SLASH;S_WORDSET;S_SLASH;S_SLASH;S_SLASH;S_SLASH;S_SLASH;S_SLASH;S_SLASH;S_SLASH_N;S_SLASH;S_SLASH;S_SLASH;S_SLASH;S_SLASH;T_ERROR;T_WORD;T_WORD;S_SLASH;S_SLASH;S_SLASH;S_SLASH;S_SLASH;T_WORD;S_SLASH;S_SLASH;T_ERROR;T_WORD
S_SLASH;T_REFINE;T_REFINE;S_SLASH;S_SLASH;T_REFINE;T_REFINE;T_REFINE;T_REFINE;T_REFINE;T_REFINE;T_REFINE;S_SLASH;S_SLASH;T_ERROR;S_SLASH;S_SLASH;S_SLASH;S_SLASH;S_SLASH;S_SLASH;S_SLASH;T_REFINE;S_SLASH;S_SLASH;S_SLASH;S_SLASH;S_SLASH;T_ERROR;T_REFINE;T_REFINE;S_SLASH;S_SLASH;S_SLASH;S_SLASH;S_SLASH;T_REFINE;S_SLASH;S_SLASH;T_ERROR;T_REFINE
S_SLASH_N;T_WORD;T_WORD;S_WORD;S_WORD;T_WORD;T_WORD;T_WORD;T_WORD;T_WORD;T_WORD;T_WORD;T_WORD;S_WORD;S_WORD;S_WORD;S_WORD;S_WORD;S_WORD;S_WORD;S_WORD;S_WORD;S_SLASH_N;S_WORD;S_WORD;S_WORD;S_WORD;T_ERROR;T_ERROR;T_WORD;T_WORD;S_WORD;T_ERROR;S_WORD;S_WORD;S_WORD;T_WORD;S_WORD;S_WORD;T_ERROR;T_WORD
S_SHARP;T_ERROR;T_ERROR;S_ISSUE;S_ISSUE;S_CONSTRUCT;T_ERROR;T_MAP_OP;T_ERROR;S_BINARY;T_ERROR;S_CHAR;S_ISSUE;S_ISSUE;T_ERROR;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;T_ERROR;T_ERROR;S_ISSUE;S_ISSUE;T_ERROR;T_ISSUE;T_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;T_ISSUE;S_ISSUE;S_ISSUE;T_ERROR;T_ISSUE
S_SHARP;T_ERROR;T_ERROR;S_ISSUE;S_ISSUE;T_MAP_OP;T_ERROR;S_CONSTRUCT;T_ERROR;S_BINARY;T_ERROR;S_CHAR;S_ISSUE;S_ISSUE;T_ERROR;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;T_ERROR;T_ERROR;S_ISSUE;S_ISSUE;T_ERROR;T_ISSUE;T_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;T_ISSUE;S_ISSUE;S_ISSUE;T_ERROR;T_ISSUE
S_BINARY;S_BINARY;S_BINARY;S_BINARY;S_BINARY;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_BINARY;T_ERROR;T_ERROR;T_ERROR;T_ERROR;S_BINARY;S_BINARY;S_BINARY;S_BINARY;S_BINARY;S_BINARY;S_BINARY;S_BINARY;T_ERROR;T_ERROR;T_ERROR;S_BINARY;T_ERROR;T_ERROR;S_LINE_CMT2;T_ERROR;T_ERROR;T_ERROR;S_BINARY;T_ERROR;T_ERROR;T_ERROR;T_ERROR;S_BINARY;T_ERROR;T_ERROR
S_LINE_CMT2;S_LINE_CMT2;S_BINARY;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;S_LINE_CMT2;T_ERROR;T_ERROR
S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;T_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_SKIP_CHAR;S_CHAR;S_CHAR;S_CHAR;T_ERROR;T_ERROR
S_SKIP_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;S_CHAR;T_ERROR;T_ERROR
S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;T_CONS_MK;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;T_ERROR;T_ERROR
S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;T_CONS_MK;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;S_CONSTRUCT;T_ERROR;T_ERROR
S_ISSUE;T_ISSUE;T_ISSUE;S_ISSUE;S_ISSUE;T_ISSUE;T_ISSUE;T_ISSUE;T_ISSUE;T_ISSUE;T_ISSUE;T_ISSUE;S_ISSUE;S_ISSUE;T_ERROR;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;T_ERROR;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;T_ISSUE;T_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;S_ISSUE;T_ISSUE;S_ISSUE;S_ISSUE;T_ERROR;T_ISSUE
S_NUMBER;T_INTEGER;T_INTEGER;S_NUMBER;S_NUMBER;T_INTEGER;T_INTEGER;T_INTEGER;T_INTEGER;T_INTEGER;T_INTEGER;T_INTEGER;S_SHARP;S_NUMBER;S_TIME_1ST;S_PAIR_1ST;S_DATE;S_HEX_END2;S_DECEXP;S_DECX;T_ERROR;S_INT_HEX;S_DATE;T_ERROR;T_INTEGER;T_ERROR;T_ERROR;T_PERCENT;T_INTEGER;T_INTEGER;S_EMAIL;S_DOTNUM;T_ERROR;T_ERROR;S_DATE;T_ERROR;T_INTEGER;T_ERROR;T_ERROR;T_ERROR;T_INTEGER
S_DOTNUM;T_FLOAT;T_FLOAT;S_DECIMAL;S_DECIMAL;T_FLOAT;T_FLOAT;T_FLOAT;T_FLOAT;T_FLOAT;T_FLOAT;T_FLOAT;S_DEC_SPECIAL;S_DECIMAL;T_ERROR;S_PAIR_1ST;T_ERROR;T_ERROR;S_DECEXP;S_DECEXP;T_ERROR;T_ERROR;T_FLOAT;T_ERROR;T_FLOAT;T_ERROR;T_ERROR;T_PERCENT;T_FLOAT;T_FLOAT;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_FLOAT;T_ERROR;T_ERROR;T_ERROR;T_FLOAT
Expand All @@ -34,6 +34,7 @@ S_TIME_1ST;T_ERROR;T_ERROR;S_TIME;S_TIME;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR
S_TIME;T_TIME;T_TIME;S_TIME;S_TIME;T_TIME;T_TIME;T_TIME;T_TIME;T_TIME;T_TIME;T_TIME;T_ERROR;T_ERROR;S_TIME;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_TIME;T_ERROR;T_TIME;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_TIME;T_ERROR;S_TIME;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_TIME;T_ERROR;T_ERROR;T_ERROR;T_TIME
S_PAIR_1ST;T_ERROR;T_ERROR;S_PAIR;S_PAIR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;S_EMAIL;T_ERROR;T_ERROR;S_PAIR;S_PAIR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR
S_PAIR;T_PAIR;T_PAIR;S_PAIR;S_PAIR;T_PAIR;T_PAIR;T_PAIR;T_PAIR;T_PAIR;T_PAIR;T_PAIR;T_ERROR;T_ERROR;T_PAIR;T_ERROR;T_ERROR;T_ERROR;S_PAIR;S_PAIR;T_ERROR;T_ERROR;T_PAIR;T_ERROR;T_PAIR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_PAIR;S_EMAIL;S_PAIR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_PAIR;T_ERROR;T_ERROR;T_ERROR;T_PAIR
S_POINT;S_POINT;T_ERROR;S_POINT;S_POINT;T_ERROR;S_POINT;T_ERROR;T_POINT;T_ERROR;T_ERROR;T_ERROR;S_POINT;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;S_POINT;S_POINT;S_POINT;S_POINT;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;S_POINT;T_ERROR;T_ERROR;S_POINT;T_ERROR;S_POINT;S_POINT;T_ERROR;T_ERROR;T_ERROR;S_POINT;T_ERROR;T_ERROR
S_MONEY_1ST;T_ERROR;T_ERROR;S_MONEY;S_MONEY;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR
S_MONEY;T_MONEY;T_MONEY;S_MONEY;S_MONEY;T_MONEY;T_MONEY;T_MONEY;T_MONEY;T_MONEY;T_MONEY;T_MONEY;T_MONEY;S_MONEY;T_MONEY;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_MONEY;T_ERROR;T_MONEY;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_MONEY;T_ERROR;S_MONEY_DEC;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_MONEY;T_ERROR;T_ERROR;T_ERROR;T_MONEY
S_MONEY_DEC;T_MONEY;T_MONEY;S_MONEY_DEC;S_MONEY_DEC;T_MONEY;T_MONEY;T_MONEY;T_MONEY;T_MONEY;T_MONEY;T_MONEY;T_MONEY;S_MONEY_DEC;T_MONEY;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_MONEY;T_ERROR;T_MONEY;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_MONEY;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_ERROR;T_MONEY;T_ERROR;T_ERROR;T_ERROR;T_MONEY
Expand Down
Binary file modified docs/lexer/lexer-FSM.xlsx
Binary file not shown.
17 changes: 13 additions & 4 deletions docs/lexer/lexer-states.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ S_TIME_1ST
S_TIME
S_PAIR_1ST
S_PAIR
S_POINT
S_MONEY_1ST
S_MONEY
S_MONEY_DEC
Expand Down Expand Up @@ -91,6 +92,7 @@ T_FLOAT_SP
T_TUPLE
T_DATE
T_PAIR
T_POINT
T_TIME
T_MONEY
T_TAG
Expand All @@ -99,7 +101,6 @@ T_EMAIL
T_HEX
T_RAWSTRING
T_REF
T_POINT2D

--- Lexical classes ---

Expand Down Expand Up @@ -173,6 +174,7 @@ delimit2: ws | [ | ] | ( | ) | { | } | " | ; | < | # | : | / | EOF
delimit11: ws | [ | ] | ( | ) | { | } | " | ; | < | / | \ | 0-9 | EOF
delimit18: ws | [ | ] | ( | ) | { | } | : | ; | < | > | = | , | @ | / | EOF
delimit3: ws | [ | ] | ( | ) | { | } | " | % | ; | < | # | @ | / | \ | ^ | , | : | $ | EOF
delimit30: cr | lf | [ | ] | ( | { | } | " | ' | : | x | T | h | H | / | \ | < | > | = | % | ; | @ | $ | ^ | C_C0 | C_BIN | C_EOF


hexa: C_ZERO | C_DIGIT | C_ALPHAX
Expand All @@ -183,6 +185,8 @@ word1st!=: C_X | T | h | e | E | C_ALPHAL | C_ALPHAU | < | > | . | + | - | C_BIN
p-word1st: C_X | T | h | e | E | C_ALPHAL | C_ALPHAU | > | = | . | C_BIN | C_WORD
p-word: 0-9 | ' | C_X | T | h | e | E | C_ALPHAL | C_ALPHAU | < | > | = | . | + | - | ^ | C_BIN | C_WORD

point-char: space | tab | C_DIGIT | 0 | # | e | E | . | , | + | - | C_ALPHAL | C_ALPHAU | N | I

--- FSM transitions ---

S_START->ws->S_START
Expand Down Expand Up @@ -251,10 +255,10 @@ S_START->"#"->S_SHARP->"{"->S_BINARY->hexa|ws|"/"|"="|"+"->S_BINARY
\ \->dbl-quote->T_CHAR
\ \->EOF->T_ERROR
\
\->"("->T_MAP_OP
\->"["->T_MAP_OP
\
\->"["->S_CONSTRUCT->not("]"|EOF)->S_CONSTRUCT
\ \->"]"->T_CONS_MK
\->"("->S_CONSTRUCT->not(")"|EOF)->S_CONSTRUCT
\ \->")"->T_CONS_MK
\ \->EOF->T_ERROR
\
\->not(delimit7)->S_ISSUE->not(delimit1|"/"|":")->S_ISSUE
Expand Down Expand Up @@ -452,6 +456,11 @@ S_PATH->p-word1st->S_PATH_WORD->p-word->S_PATH_WORD
\->","|"#"|"%"|"$"->T_ERROR


S_POINT->point-char->S_POINT
\->")"->T_POINT
\->delimit30->T_ERROR


=== Binary16 classes ===

C_BIN_ILLEGAL : all the rest ;-- 0
Expand Down
2 changes: 1 addition & 1 deletion docs/red-system/red-system-specs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4203,7 +4203,7 @@ Both -** (internal representation for >>>) and /// (internal representation for
;-- c-strings, pointers and structs.

struct [
[align <n> <little|big>] ;-- change members alignment and endianess
[align <n> <little|big>] ;-- change members alignment and endianness
<members>
]

Expand Down
Loading

0 comments on commit 6843ae1

Please sign in to comment.