Skip to content

[DRAFT] PEG Parser via rust-peg #4423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
qingshi163 wants to merge 32 commits into
base: main
Choose a base branch
from
Draft

[DRAFT] PEG Parser via rust-peg #4423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c327f74
create PegTokens
qingshi163 Jan 2, 2023
0712ca6
wip
qingshi163 Jan 5, 2023
f5725f8
wip 2
qingshi163 Jan 5, 2023
e805363
wip 3
qingshi163 Jan 5, 2023
471688f
pass build
qingshi163 Jan 16, 2023
dc38b63
wip 4
qingshi163 Jan 20, 2023
91ddb19
stage 1
qingshi163 Jan 25, 2023
3203aba
simplify async
qingshi163 Jan 25, 2023
3286b57
wip 1
qingshi163 Jan 25, 2023
28a33ea
lambda
qingshi163 Jan 28, 2023
5a370ec
fix
qingshi163 Jan 29, 2023
77a4219
fixup
qingshi163 Jan 29, 2023
9a2888d
remove lalrpop
qingshi163 Jan 29, 2023
14b023c
pass build
qingshi163 Jan 31, 2023
f5be12d
fix kwds
qingshi163 Jan 31, 2023
762ca27
fix async def
qingshi163 Jan 31, 2023
e6fbcb0
fix slice
qingshi163 Jan 31, 2023
f8523fe
fix del_stmt
qingshi163 Jan 31, 2023
3f93711
fix empty sqb assignment
qingshi163 Jan 31, 2023
e20fc5b
fix eval
qingshi163 Feb 1, 2023
277f560
impl PegTok copyable
qingshi163 Feb 2, 2023
7a7f29b
remove lalrpop steps from ci
qingshi163 Feb 2, 2023
2ad5c61
error handling
qingshi163 Feb 2, 2023
22d06c2
remove python.rs
qingshi163 Feb 3, 2023
e07cd75
error unrecognized token
qingshi163 Feb 3, 2023
4aa3d9b
fix class def location
qingshi163 Feb 5, 2023
a8c6bfb
fix function location
qingshi163 Feb 5, 2023
fbff22a
fix block location
qingshi163 Feb 5, 2023
1424e55
refactor
qingshi163 Feb 11, 2023
fa5063c
reduce indent
qingshi163 Feb 11, 2023
7bf0146
fix tuple
qingshi163 Feb 11, 2023
920ebdd
clearup
qingshi163 Feb 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 0 additions & 77 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,19 +104,13 @@ jobs:
env:
RUST_BACKTRACE: full
name: Run rust tests
needs: lalrpop
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
fail-fast: false
steps:
- uses: actions/checkout@v3
- name: Cache generated parser
uses: actions/cache@v2
with:
path: compiler/parser/python.rs
key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
- uses: dtolnay/rust-toolchain@stable
with:
components: clippy
Expand Down Expand Up @@ -160,16 +154,9 @@ jobs:
exotic_targets:
if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
name: Ensure compilation on various targets
needs: lalrpop
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Cache generated parser
uses: actions/cache@v2
with:
path: compiler/parser/python.rs
key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}

- uses: dtolnay/rust-toolchain@stable
with:
target: i686-unknown-linux-gnu
Expand Down Expand Up @@ -224,7 +211,6 @@ jobs:

snippets_cpython:
if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
needs: lalrpop
env:
RUST_BACKTRACE: full
name: Run snippets and cpython tests
Expand All @@ -235,12 +221,6 @@ jobs:
fail-fast: false
steps:
- uses: actions/checkout@v3
- name: Cache generated parser
uses: actions/cache@v2
with:
path: compiler/parser/python.rs
key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}

- uses: dtolnay/rust-toolchain@stable
- uses: actions/setup-python@v2
with:
Expand Down Expand Up @@ -290,50 +270,11 @@ jobs:
mkdir site-packages
target/release/rustpython --install-pip ensurepip --user

lalrpop:
if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
name: Generate parser with lalrpop
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- name: Cache generated parser
uses: actions/cache@v2
with:
path: compiler/parser/python.rs
key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
- name: Check if cached generated parser exists
id: generated_parser
uses: andstor/file-existence-action@v1
with:
files: "compiler/parser/python.rs"
- if: runner.os == 'Windows'
name: Force python.lalrpop to be lf # actions@checkout ignore .gitattributes
run: |
set file compiler/parser/python.lalrpop; ((Get-Content $file) -join "`n") + "`n" | Set-Content -NoNewline $file
- name: Install lalrpop
if: steps.generated_parser.outputs.files_exists == 'false'
uses: baptiste0928/cargo-install@v1
with:
crate: lalrpop
version: "0.19.8"
- name: Run lalrpop
if: steps.generated_parser.outputs.files_exists == 'false'
run: lalrpop compiler/parser/python.lalrpop

lint:
name: Check Rust code with rustfmt and clippy
needs: lalrpop
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Cache generated parser
uses: actions/cache@v2
with:
path: compiler/parser/python.rs
key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
- uses: dtolnay/rust-toolchain@stable
with:
components: rustfmt, clippy
Expand Down Expand Up @@ -361,15 +302,9 @@ jobs:
miri:
if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
name: Run tests under miri
needs: lalrpop
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Cache generated parser
uses: actions/cache@v2
with:
path: compiler/parser/python.rs
key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly
Expand All @@ -384,15 +319,9 @@ jobs:
wasm:
if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
name: Check the WASM package and demo
needs: lalrpop
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Cache generated parser
uses: actions/cache@v2
with:
path: compiler/parser/python.rs
key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
- uses: dtolnay/rust-toolchain@stable

- uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -434,15 +363,9 @@ jobs:
wasm-wasi:
if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip:ci') }}
name: Run snippets and cpython tests on wasm-wasi
needs: lalrpop
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Cache generated parser
uses: actions/cache@v2
with:
path: compiler/parser/python.rs
key: lalrpop-${{ hashFiles('compiler/parser/python.lalrpop') }}
- uses: dtolnay/rust-toolchain@stable
with:
target: wasm32-wasi
Expand Down
Loading