Skip to content

Commit

Permalink
Parser upgrade (#66)
Browse files Browse the repository at this point in the history 
* Update gen-json-spec.yml

* Add files via upload

* Add files via upload

* actions—generate JSON langspec

* Add files via upload

* actions—generate JSON langspec

* update types

* update Action

* typo

* MD formatting

* mv formatter file

* add a shellscript bc lazy

* fix scripts

* oh dear help markdown needs fixing

* Update scripts to individualize columns

* Updated hard formatting rules

* fixed error logging

* fix error detection

* update actions

* add validation

* run scripts

* gen rawspec

* update GH action

* update gitattributes

---------

Co-authored-by: flowerlovingatheist <[email protected]>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Akhil Pillai <[email protected]>
  • Loading branch information
@ackle-dev @flowerlovingatheist @github-actions
4 people authored Dec 27, 2024
1 parent 8d29453 commit af7dcf3
Show file tree
Hide file tree
Showing 34 changed files with 2,422 additions and 1,829 deletions.
4 changes: 4 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
*.json linguist-documentation=false
*.json linguist-detectable=true

# overwrite all merge conflicts with the local version,
# it'll be updated by automation anyways
*.json merge=ours

*.yml linguist-vendored=false
*.yml linguist-generated=false
*.yml linguist-documentation=false
Expand Down
34 changes: 17 additions & 17 deletions .github/workflows/gen-json-spec.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,29 @@ name: Generate JSON language specification

on:
push:
branches: [ "main" ]
branches: ['main']
workflow_dispatch:

jobs:
build:

runs-on: ubuntu-latest
permissions:
contents: write

steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: node
- run: cd scripting && npm ci && npm start
- name: Add & Commit
uses: EndBug/[email protected]
with:
add: rawspec
default_author: github_actions
fetch: true
message: actions—generate JSON langspec
- uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: node
- run: bash run-scripts.sh
name: Generate JSON language specification and test
- name: Add & Commit
uses: EndBug/[email protected]
with:
add: rawspec
default_author: github_actions
fetch: true
message: actions—generate JSON langspec
0 scripting/.prettierrc → .prettierrc
View file
File renamed without changes.
12 changes: 12 additions & 0 deletions Formatting.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@
- The title should be a level 1 heading, that is, the line should be preceded a `#`.
- Sections, subsections, or n\*(sub)sections should be level 2, 3, or n headings respectively. If you need more than the 6 default headings included in standard markdown, you're probably doing something wrong.

**For parser compatibility, each table should follow the following column format:**

```markdown
| Spelling | Definition / Meaning | English Equivalent / Implication |
| -------- | -------------------- | -------------------------------- |
| foo | bar | baz |
```

(Padding data cells with spaces is not necessary.)

If an entry does not have a direct translation (definition or meaning), then it **must** have an implication. No exceptions, other we have completely undefined words.

## Soft rules/guidelines

### Regarding the raw markdown code
Expand Down
77 changes: 77 additions & 0 deletions Obscurisms.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# Obscurisms

Obscurisms are words or alternative forms of words that are not used in everyday conversation, but are still part of the language. Although they are not expected to be used in most contexts, they are still completely accepted as valid and may thus be used in any contexts interchangeably with the regular forms.

Obscurisms originated from an original distinction between extended and non-extended forms of morphemes which was present during the early development of the language, and were later discarded. However, they were later reincorporated into the language as alternative forms of words, which were added to the accepted vocabulary as obscurisms, mostly for cryptic uses and historical conservation.

Since they are not expected to be used in most contexts, they are not included in the main vocabulary lists. New learners are not expected to learn them, but they should be aware of their existence.

Due to them stemming from an older stage of the language, they are not subject to the usual rules of word formation and may thus look rather strange. They often do not follow standard syllable structure with some of them incorporating apostrophes.

Additionally, even though many of them resemble their normal counterparts, the standard forms have evolved over time, leading to some of them not even remotely resembling their regular counterparts. There are even some instances where there does not exist a regular counterpart for an obscurism, since the regular form was completely discarded, the case of "-wa" being the most prominent example.

## List of Obscurisms with no standard counterpart

| Spelling (obscure) | Spelling (standard) | Implication / Definition / Used as | Type | Etymology of the obscure form | Notes |
|--------------------|---------------------|------------------------------------|------|------------------------------|-------|
| w, wa | | inanimate pronoun | pronoun | "w" is the shortened form of "wa"; both are accepted as valid obscurisms | the inanimate pronoun was discarded |
| te | | important, or previously discussed, object, entity or concept | article | | not to be confused with the standard form "te" (the) |

## List of Obscurisms with standard counterpart

| Spelling (obscure) | Spelling (standard) | Type | Etymology of the obscure form | Notes |
|--------------------|---------------------|------|------------------------------|-------|
| nen' | nen | adverb | | |
| sun' | sun | adverb | | |
| tun' | tun | adverb | | |
| sac | saci | adverb | | |
| tac | taci | adverb | | |
| tah | tahi | adverb | | |
| kah | kahi | adverb | | |
| soh | sohi | adverb | | |
| taw | tawa | adverb | | |
| kaw | kawa | adverb | | |
| sow | sowa | adverb | | |
| plu | pum | conjunction | the word for the logical conjunction, now "pum", was originally "pulu" | |
| nen' | nen | interjection | | |
| hnl | henlo | interjection | | |
| n | na | interjection | | |
| kon'ba | konba | interjection | | |
| k | ke | interjection | | |
| bwe | biwe | interjection | | |
| hh | hihi | interjection | | |
| kas | kase | noun | | |
| hn' | hun | noun | | |
| lm | luma | noun | | |
| mw | mawa | noun | | |
| ln'mi | lanmi | noun | | |
| wn'tu | wantu | noun | | |
| fal | falo | noun | | |
| ln'wa | linwa | noun | | |
| cn'ku | lumaba | noun | | the word for "friend", now "lumaba", was originally "cinku" |
| dwu | dawu | noun | | |
| ntu | natu | noun | | |
| mw | mawa | noun | | |
| wno | wano | numeral | | |
| dwu | duwo | numeral | | |
| bmo | bimo | numeral | | |
| cko | ciko | numeral | | |
| sbo | sebo | numeral | | |
| won'to | wonto | numeral | | |
| nin'to | ninto | numeral | | |
| din'ko | dinko | numeral | | |
| mid | mida | pronoun | | |
| tal | talo | pronoun | | |
| kal | kalo | pronoun | | |
| sol | solo | pronoun | | |
| -r | -ri | suffix | | |
| -s | -se | suffix | | |
| -k | -ke | suffix | | |
| -c | -ci | suffix | | |
| -p | -pa | suffix | | |
| -fal | -falo | suffix | | |
| -d | -da | suffix | | |
| -l | -lo | suffix | | |
| mw | mawa | verb | | |
| bn'ta | binta | verb | | |
| ten'co | tenco | verb | | |
85 changes: 41 additions & 44 deletions Vocabulary/Adjectives.md
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,43 @@
# Adjectives

| Spelling | Definition |
|----------|------------|
| mi | cute |
| wusita | good |
| disita | bad |
| nen | not |
| toransu | different, other |
| somo | sleepy |
| sekiso | sexy, fuckable |
| deja | active |
| gara | all |
| coko | some |
| boro | any |
| gurati | negative freedom, free (price) |
| lifeta | positive freedom, liberated |
| jala | able, capable of |
| mire | mid, average |
| misu | liquid, fluid |
| ten | solid, rigid |
| lufi | gaseous |
| cinda | new |
| gunda | old |
| cindajin | modern |
| gundajin | ancient |
| cingun | physically light |
| cingunem | psychologically light |
| qongun | physically heavy |
| qongunem | psychologically heavy |
| anoman | angry |
| teto | large (size) |
| ciki | short (size) |
| kanacin | sad |
| tanocin | happy |
| cangi | long (time) |
| dangi | short (time) |
| tenza | tall (height) |
| kenki | short (height) |
| suci | intelligent |
| mimi | adorable |
| dakun | black, dark |
| lajito | white, light, bright |
| miremire | gray |
| mayu | very, extremely |
| suranto | same |
| Spelling | English Equivalent | Implication / Definition / Used as |
|----------|--------------------|--------------------------------|
| mi | cute | |
| wusita | good | |
| disita | bad | |
| nen | not | |
| toransu | different, other | |
| somo | sleepy | |
| sekiso | sexy, fuckable | |
| deja | active | |
| gara | all | |
| coko | some | |
| boro | any | |
| gurati | free (price), autonomous, non-interfered-with | negative freedom |
| lifeta | liberated | positive freedom |
| jala | able, capable of | |
| mire | mid, average | |
| misu | liquid, fluid | |
| ten | solid, rigid | |
| lufi | gaseous | |
| cinda | new | |
| gunda | old | |
| cindajin | modern | |
| gundajin | ancient | |
| cingun | physically light | |
| cingunem | psychologically light | |
| qongun | physically heavy | |
| qongunem | psychologically heavy | |
| anoman | angry | |
| teto | large (size) | |
| ciki | short (size) | |
| kanacin | sad | |
| tanocin | happy | |
| cangi | long (time) | |
| dangi | short (time) | |
| tenza | tall (height) | |
| kenki | short (height) | |
| suci | intelligent | |
| mimi | adorable | |
| dakun | black, dark | |
| lajito | white, light, bright | |
40 changes: 22 additions & 18 deletions Vocabulary/Adverbs.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,33 @@

## Miscellaneous adverbs

| Spelling | Definition |
| -------- | ---------- |
| nen | no |
| con | soon |
| huba | overly |
| mayu | very, extremely |
| sun | why |
| saci | how |
| Spelling | English Equivalent | Implication / Definition / Used as |
|----------|--------------------|--------------------------------|
| nen | no | logical negation |
| con | soon | |
| huba | overly | |
| mayu | very, extremely | |
| sun | why | interrogative question of cause |
| tun | because | statement of cause |
| saci | how | interrogative question of methodology |
| taci | | description of methodology |

## Temporal adverbs

(-hi is the termination for a temporal adverb)
| Spelling | Definition |
| -------- | ---------- |
| tahi | now |
| kahi | then |
| sohi | when |

| Spelling | English Equivalent | Implication / Definition / Used as |
|----------|--------------------|--------------------------------|
| tahi | now | |
| kahi | then | |
| sohi | when | |

## Demonstrative adverbs

(-wa is the termination for a demonstrative adverb)
| Spelling | Definition |
| -------- | ---------- |
| tawa | here |
| kawa | there |
| sowa | where |

| Spelling | English Equivalent | Implication / Definition / Used as |
|----------|--------------------|--------------------------------|
| tawa | here | |
| kawa | there | |
| sowa | where | |
10 changes: 5 additions & 5 deletions Vocabulary/Conjunctions.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Conjunctions

| Spelling | Definition |
| -------- | ---------- |
| pum | and |
| ron | or |
| no | but |
| Spelling | English Equivalent | Implication / Definition / Used as |
|----------|--------------------|------------------------------------|
| pum | and | logical conjunction |
| ron | or | logical disjunction |
| no | but | logical implication |
22 changes: 11 additions & 11 deletions Vocabulary/Interjections.md
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Interjections

| Spelling | Definition |
| -------- | ---------- |
| sim | yes |
| nen | no |
| henlo | hello |
| na | hi |
| konba | goodbye |
| mi | cute! |
| ke | ok |
| biwe | thanks |
| hihi | laughter |
| Spelling | English Equivalent | Implication / Definition / Used as |
|----------|--------------------|------------------------------------|
| sim | yes | |
| nen | no | |
| henlo | hello | |
| na | hi | |
| konba | goodbye | |
| mi | cute | |
| ke | ok | confirmation, acknowledgement |
| biwe | thanks | |
| hihi | laughter | |
Loading

0 comments on commit af7dcf3

Please sign in to comment.