From a85c3724625acc329823633521590667eae8e6ca Mon Sep 17 00:00:00 2001 From: elvis Date: Mon, 17 Nov 2025 04:13:29 +0100 Subject: [PATCH] better tokens --- grammar_separated/src/grammar.lalrpop | 79 ++------------------------- 1 file changed, 5 insertions(+), 74 deletions(-) diff --git a/grammar_separated/src/grammar.lalrpop b/grammar_separated/src/grammar.lalrpop index b205b79..4ebf115 100644 --- a/grammar_separated/src/grammar.lalrpop +++ b/grammar_separated/src/grammar.lalrpop @@ -19,25 +19,10 @@ extern { // order match { - "!", "(", ")", "+", ",", "-", ".", ":", ";", "<", "<=", "=", "==", ">", - ">=", "?", "AbsentReactants", "Bisimilarity", "Context", - "Context.EntitySet", "Context.Nill", "Context.NonDeterministicChoice", - "Context.RecursiveIdentifier", "Context.Summation", "Context.WaitEntity", - "Deserialize", "Difference", "Digraph", "Dot", "Entities", "EntitiesAdded", - "EntitiesDeleted", "Environment", "ExcludeEntities", "FastFrequency", - "GraphML", "Grequency", "Hide", "Inhibitors", "InhibitorsPresent", "Initial - Entities", "Limit", "LimitFrequency", "Loop", "MaskContext", - "MaskDifference", "MaskEntities", "MaskEntitiesAdded", - "MaskEntitiesDeleted", "MaskProducts", "MaskUncommonEntities", "MaskUnion", - "PresentInhibitors", "Print", "Products", "Reactants", "ReactantsAbsent", - "Reactions", "Run", "Save", "Serialize", "Sets", "Stats", "T", "Target", - "UncommonContext", "UncommonDifference", "UncommonEntities", - "UncommonEntitiesAdded", "UncommonEntitiesDeleted", "UncommonMaskContext", - "UncommonMaskDifference", "UncommonMaskEntities", - "UncommonMaskEntitiesAdded", "UncommonMaskEntitiesDeleted", - "UncommonMaskProducts", "UncommonMaskUnion", "UncommonProducts", - "UncommonUnion", "Union", "Weights", "[", "]", "i:", "nill", "p:", "r:", - "relabel", "{", "|", "}", "⊂", "⊃", "⊆", "⊇", + "(", ")", "+", ",", "-", ".", ":", ";", "<", "=", ">", "?", "Context", + "Entities", "Environment", "Inhibitors", "InhibitorsPresent", "Initial + Entities", "Products", "Reactants", "ReactantsAbsent", "Reactions", "Sets", + "Weights", "[", "\"", "]", "i:", "nill", "p:", "r:", "{", "}", } else { r"[0-9]+" => NUMBER } else { @@ -56,72 +41,18 @@ Literal: String = { LiteralProcess: String = { Literal => <>, - "AbsentReactants" => <>.into(), - "Bisimilarity" => <>.into(), "Context" => <>.into(), - "Context.EntitySet" => <>.into(), - "Context.Nill" => <>.into(), - "Context.NonDeterministicChoice" => <>.into(), - "Context.RecursiveIdentifier" => <>.into(), - "Context.Summation" => <>.into(), - "Context.WaitEntity" => <>.into(), - "Deserialize" => <>.into(), - "Difference" => <>.into(), - "Digraph" => <>.into(), - "Dot" => <>.into(), "Entities" => <>.into(), - "EntitiesAdded" => <>.into(), - "EntitiesDeleted" => <>.into(), "Environment" => <>.into(), - "ExcludeEntities" => <>.into(), - "FastFrequency" => <>.into(), - "GraphML" => <>.into(), - "Grequency" => <>.into(), - "Hide" => <>.into(), "Inhibitors" => <>.into(), "InhibitorsPresent" => <>.into(), - "Initial" => <>.into(), - "Limit" => <>.into(), - "LimitFrequency" => <>.into(), - "Loop" => <>.into(), - "MaskContext" => <>.into(), - "MaskDifference" => <>.into(), - "MaskEntities" => <>.into(), - "MaskEntitiesAdded" => <>.into(), - "MaskEntitiesDeleted" => <>.into(), - "MaskProducts" => <>.into(), - "MaskUncommonEntities" => <>.into(), - "MaskUnion" => <>.into(), - "PresentInhibitors" => <>.into(), - "Print" => <>.into(), + "Initial Entities" => <>.into(), "Products" => <>.into(), "Reactants" => <>.into(), "ReactantsAbsent" => <>.into(), "Reactions" => <>.into(), - "Run" => <>.into(), - "Save" => <>.into(), - "Serialize" => <>.into(), "Sets" => <>.into(), - "Stats" => <>.into(), - "T" => <>.into(), - "Target" => <>.into(), - "UncommonContext" => <>.into(), - "UncommonDifference" => <>.into(), - "UncommonEntities" => <>.into(), - "UncommonEntitiesAdded" => <>.into(), - "UncommonEntitiesDeleted" => <>.into(), - "UncommonMaskContext" => <>.into(), - "UncommonMaskDifference" => <>.into(), - "UncommonMaskEntities" => <>.into(), - "UncommonMaskEntitiesAdded" => <>.into(), - "UncommonMaskEntitiesDeleted" => <>.into(), - "UncommonMaskProducts" => <>.into(), - "UncommonMaskUnion" => <>.into(), - "UncommonProducts" => <>.into(), - "UncommonUnion" => <>.into(), - "Union" => <>.into(), "Weights" => <>.into(), - "relabel" => <>.into(), }; Num: i64 = {