Skip to content

Commit

Permalink
Merge branch 'main' into feat-borrow-no-checking
Browse files Browse the repository at this point in the history
  • Loading branch information
AjaniBilby committed May 24, 2024
2 parents 7090517 + 73d94b6 commit 0e03c29
Show file tree
Hide file tree
Showing 24 changed files with 817 additions and 433 deletions.
44 changes: 38 additions & 6 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,51 @@
name: Deploy Docs

on:
# Runs on pushes targeting the default branch
push:
branches: [ main ]
branches: ["main"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
id-token: write
contents: read
pages: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Single deploy job since we're just deploying
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Checkout
uses: actions/checkout@v4
- name: Setup Pages
uses: actions/configure-pages@v4
- name: Set up Python 3
uses: actions/setup-python@v3

- name: Install dependencies
run: python -m pip install -r docs/requirements.txt

- name: Build Docs
run: mkdocs gh-deploy --force
- name: Build Site
run: mkdocs build

- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
# Upload entire repository
path: './site'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
.pnpm-debug.log*

# Compiled outputs
site/*
build/*
bin/*

Expand Down
4 changes: 2 additions & 2 deletions source/bnf/syntax.bnf
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,13 @@ function ::= func_head %w* ( block | ";" ) %w* ;
func_arg ::= ...name %( w* ":" w* ) access ;

block ::= %( "{" w* ) block_stmt* %( w* "}" w* ) ;
block_stmt ::= assign | declare | return | raise | statement ;
block_stmt ::= assign | declare | return | lift | statement ;

func_call ::= access func_call_body;
func_call_body ::= %( w* "(" w* ) ( expr %w* ( %( "," w* ) expr %w* )* )? %( ")" w* ) ;

return ::= %"return" "_tail"? ( %w+ expr)? %( w* ";" w* );
raise ::= %"raise" %w+ expr %( ";" w* ); # TODO rename to lift
lift ::= %"lift" %w+ expr %( ";" w* );
# drop ::= %"drop" %w+ expr %( ";" w* );


Expand Down
10 changes: 5 additions & 5 deletions source/bnf/syntax.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -917,7 +917,7 @@ export type Term_Block_stmt = {
count: number,
ref: _Shared.ReferenceRange,
value: [
(Term_Assign | Term_Declare | Term_Return | Term_Raise | Term_Statement)
(Term_Assign | Term_Declare | Term_Return | Term_Lift | Term_Statement)
]
}
export declare function Parse_Block_stmt (i: string, refMapping?: boolean): _Shared.ParseError | {
Expand Down Expand Up @@ -1008,8 +1008,8 @@ export declare function Parse_Return (i: string, refMapping?: boolean): _Shared.
isPartial: boolean
}

export type Term_Raise = {
type: 'raise',
export type Term_Lift = {
type: 'lift',
start: number,
end: number,
count: number,
Expand All @@ -1018,8 +1018,8 @@ export type Term_Raise = {
Term_Expr
]
}
export declare function Parse_Raise (i: string, refMapping?: boolean): _Shared.ParseError | {
root: _Shared.SyntaxNode & Term_Raise,
export declare function Parse_Lift (i: string, refMapping?: boolean): _Shared.ParseError | {
root: _Shared.SyntaxNode & Term_Lift,
reachBytes: number,
reach: null | _Shared.Reference,
isPartial: boolean
Expand Down
6 changes: 3 additions & 3 deletions source/bnf/syntax.js

Large diffs are not rendered by default.

Loading

0 comments on commit 0e03c29

Please sign in to comment.