From fe182abeaeb5054df8ffd757c28f97ece19ac8f5 Mon Sep 17 00:00:00 2001 From: Benjamin Culkin Date: Wed, 31 Jan 2024 20:27:06 -0500 Subject: Fix a few things --- data/new-sample-grammars/artificers-handbook.gram | 22 +++++++++++----------- data/sample-grammars/career.gram | 6 +++--- data/sample-grammars/names.gram | 1 + todos.txt | 4 ++++ 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/data/new-sample-grammars/artificers-handbook.gram b/data/new-sample-grammars/artificers-handbook.gram index 2ecb8ae..673b56b 100644 --- a/data/new-sample-grammars/artificers-handbook.gram +++ b/data/new-sample-grammars/artificers-handbook.gram @@ -6,22 +6,22 @@ pragma export-rule [magic-item] [magic-item-creation] [name1] [name2] originally made the item as a gift for [hero1] [hero2] The item was made by [name2] [title1] for a [group1] [group2] - Crafted by [nameless], the item was later stolen by [hero1] [title2] - Fashioned by the leader of a [group1] [group2], [name1] [hero2], the item was sold to [hero1] [name2] - Though its maker is unknown, the item was first found in the possession of [slayers], slain by a party lead by [hero1] [hero2]. + Crafted by [nameless] , the item was later stolen by [hero1] [title1] + Fashioned by the leader of a [group1] [group2] , [name1] [hero2] , the item was sold to [hero1] [name2] + Though its maker is unknown, the item was first found in the possession of [slayers] , slain by a party lead by [hero1] [hero2] . The head of a [group1] clan ordered the item made for [nameless] [magic-item-purpose] The item was made [purpose1] the leader of a [group1] [group2] - However, the item was later stolen by [name1], a lowly [group1], and used [purpose2] + However, the item was later stolen by [name1] , a lowly [group1], and used [purpose2] The item was made to help slay [slayers] The item was made in hopes of aiding the owner in his quest [purpose3] The item was used [purpose4] The item was put to use by an adventuring party, who used it when they [purpose5] -[magic-item-loss] When the owner was killed [killed1], the item was [lost2] and never mentioned again +[magic-item-loss] When the owner was killed [killed1] , the item was [lost2] and never mentioned again Years later, the item was thought [lost1] and lost forever. Until now... The owner was later killed by [slayers] and the item taken as part of its hoard - The owner of the item was [killed2], the item was [lost2], and lost to history + The owner of the item was [killed2] , the item was [lost2] , and lost to history Following his adventures, the owner [killed3] and the item was eventually [lost3] The owner was slain in a dual with [hero1] [hero2] and the item later sold to [nameless] for a tidy profit @@ -496,15 +496,15 @@ pragma export-rule [magic-item] to sell to the highest bidder to kill a vampiric ancestor to satisfy a hag's curse - to join [hero1] [hero2]'s [group2] + to join [hero1] [hero2] 's [group2] to get an apprenticeship with [name1] [title1] to impress a [nameless] and garner favors - to complete a [nameless]'s [geas||quest] + to complete a [nameless] 's [geas||quest] [hisher] his her -[purpose3] seeking a cure for [name1] [name2]'s disease +[purpose3] seeking a cure for [name1] [name2] 's disease looking for lost tomes and texts killing every [group1] [he||she] comes across running from the [group2] seeking his life @@ -531,13 +531,13 @@ pragma export-rule [magic-item] to use during the [group1] war as part of a complicated scheme to bring down [hero1] [hero1] as a piece of a larger set of magical equipment - as a centerpiece for a [king||queen]'s collection of magical items + as a centerpiece for a [king||queen] 's collection of magical items to bribe a half-[group1] half-[group1] clan to buy passage across the barrier between life and death to capture a retriever to fulfill a contract with a celestial deva to satisfy a contract with a pit fiend - to be used during the storming of [hero1] [name2]'s castle + to be used during the storming of [hero1] [name2] 's castle as bounty for the deaths of the leaders of a [group1] [group2] for use in a rebellion against a merchant [king||queen] for use during a vicious and bitter civil war diff --git a/data/sample-grammars/career.gram b/data/sample-grammars/career.gram index 3f527be..dfe9f03 100644 --- a/data/sample-grammars/career.gram +++ b/data/sample-grammars/career.gram @@ -16,7 +16,7 @@ pragma suffix-with [career-tech-desc] <&1..2> [career-tech-descsuff] (secretly [career-techname] ) [career-techname] [career-tech] - [career-tech] , [full-name-and-title] + [career-tech] , [^full-name-and-title] pragma export-rule [career-techname] @@ -34,7 +34,7 @@ pragma despace-rule [quote-career-tech] [career-tech2] <^10> [act-career-tech] [act-career-tech] (reports to the [career-tech] ) - [act-career-tech] (reports to [full-name-and-title] ) + [act-career-tech] (reports to [^full-name-and-title] ) [act-career-tech] paper pusher computer [software-career-type] @@ -126,4 +126,4 @@ pragma export-rule [act-career-tech] overseer honcho administrator - [generic-title] + [^generic-title] diff --git a/data/sample-grammars/names.gram b/data/sample-grammars/names.gram index a0c41c3..6c64d7a 100644 --- a/data/sample-grammars/names.gram +++ b/data/sample-grammars/names.gram @@ -19,6 +19,7 @@ pragma export-rule [first-name] pragma export-rule [generic-title] pragma export-rule [full-name] pragma export-rule [random-name] +pragma export-rule [full-name-and-title] [full-name-and-title] [generic-title] [last-name] [generic-title] [middle-initial] . [middle-initial] . [last-name] diff --git a/todos.txt b/todos.txt index b233b36..f975259 100644 --- a/todos.txt +++ b/todos.txt @@ -66,3 +66,7 @@ DONE(6/3/18) 10/11/17 Ben Culkin :Determinism in this context (could some sort of use of exhaustive rule vars. do this? maybe. it's been a while since last I looked at the details of how this project worked; and I doubt I left enough comments/other documentation) + +@TODO 1/31/2024 Ben Culkin :PunctRef + Fix the issue that seems to've cropped up when mixing punctuation w/ + rule-refs -- cgit v1.2.3