From fb9b0d796010d1ea2595bee68f4a642fa85758e4 Mon Sep 17 00:00:00 2001 From: Midgard Date: Sun, 26 Jan 2020 23:51:29 +0100 Subject: [PATCH] Rename "base" to "dish" --- app/hlds/hlds.tatsu | 10 +- app/hlds/models.py | 2 +- app/hlds/parser.py | 2 +- app/hlds/testfrituur.hlds | 10 +- data/fitchen.hlds | 28 ++--- data/fritoloog.hlds | 102 +++++++++---------- data/oceangarden.hlds | 8 +- data/oceangarden_future_syntax.hlds-disabled | 10 +- etc/emacs/hlds-mode.el | 2 +- etc/vim/syntax.vim | 2 +- 10 files changed, 88 insertions(+), 88 deletions(-) diff --git a/app/hlds/hlds.tatsu b/app/hlds/hlds.tatsu index bf48a1a..62538b2 100644 --- a/app/hlds/hlds.tatsu +++ b/app/hlds/hlds.tatsu @@ -8,7 +8,7 @@ @@whitespace :: // @@eol_comments :: /[ \t]*#.*?$/ -@@keyword :: single_choice multi_choice base preset only requires except +@@keyword :: single_choice multi_choice dish preset only requires except start = [n] { @+:location } $ ; @@ -37,12 +37,12 @@ attributes = block = - | base_block + | dish_block | choice_block ; -base_block = - 'base' s ~ +dish_block = + 'dish' s ~ id:identifier ':' s >attributes n choices:{ indent_choice_block } @@ -60,7 +60,7 @@ choice_block = n ; -# Appears in a base block. One of: +# Appears in a dish block. One of: # 1) reference to toplevel choice definition # 2) inline choice declaration (as opposed to globally declared and referenced) indent_choice_block = diff --git a/app/hlds/models.py b/app/hlds/models.py index be9129c..0f95936 100644 --- a/app/hlds/models.py +++ b/app/hlds/models.py @@ -65,7 +65,7 @@ class Dish: self.choices: List[(str, Choice)] = choices def __str__(self): - return "base {0.id}: {0.name}{1}{2}{3}\n\t{4}".format( + return "dish {0.id}: {0.name}{1}{2}{3}\n\t{4}".format( self, " -- {}".format(self.description) if self.description else "", _format_tags(self.tags), diff --git a/app/hlds/parser.py b/app/hlds/parser.py index 58d231c..076f2b0 100644 --- a/app/hlds/parser.py +++ b/app/hlds/parser.py @@ -35,7 +35,7 @@ class HldsSemanticActions: dishes=dishes, ) - def base_block(self, ast) -> Dish: + def dish_block(self, ast) -> Dish: return Dish( ast["id"], name=ast["name"], diff --git a/app/hlds/testfrituur.hlds b/app/hlds/testfrituur.hlds index 93ee50f..51c9e6d 100644 --- a/app/hlds/testfrituur.hlds +++ b/app/hlds/testfrituur.hlds @@ -9,9 +9,9 @@ sauce: Saus curry: Currysaus € 0.80 stoofvlees: Stoofvleessaus € 1.41 -base veggieburger: Veggieburger € 4.2 +dish veggieburger: Veggieburger € 4.2 -base friet: Friet -- Een pakje friet :: {has_meat} {has_gluten} +dish friet: Friet -- Een pakje friet :: {has_meat} {has_gluten} single_choice size: Grootte small: Small € 2 @@ -21,6 +21,6 @@ base friet: Friet -- Een pakje friet :: {has_meat} {has_gluten} multi_choice sauce -base vleeskroket: Vleeskroket -- Een vlezige kroket :: {has_meat} € 4.2 -base vleeskroket: Vleeskroket :: {has_meat} € 4.2 -base vleeskroket: Vleeskroket -- Een vlezige kroket +dish vleeskroket: Vleeskroket -- Een vlezige kroket :: {has_meat} € 4.2 +dish vleeskroket: Vleeskroket :: {has_meat} € 4.2 +dish vleeskroket: Vleeskroket -- Een vlezige kroket diff --git a/data/fitchen.hlds b/data/fitchen.hlds index 989412d..3689c82 100644 --- a/data/fitchen.hlds +++ b/data/fitchen.hlds @@ -87,7 +87,7 @@ extra_vegs: Extra groenten/zaden sesame_seeds: Sesamzaad € 0.50 pumpkin_seeds: Pompoenzaad € 0.50 -base vegan_avocado_spring: Vegan avocado spring -- Gekruide tempeh, quinoa, avocado, rode ui, komkommer, kerstomaten, babyspinazie, lijnzaad, vegan spicy dressing +dish vegan_avocado_spring: Vegan avocado spring -- Gekruide tempeh, quinoa, avocado, rode ui, komkommer, kerstomaten, babyspinazie, lijnzaad, vegan spicy dressing single_choice bowl_wrap single_choice size single_choice veggie_on_vegan_dish @@ -96,7 +96,7 @@ base vegan_avocado_spring: Vegan avocado spring -- Gekruide tempeh, quinoa, avoc multi_choice extra_protein multi_choice extra_vegs -base sunset_beach: Sunset beach -- Tofu, bruine rijst, slamix, Fitchens currydressing +dish sunset_beach: Sunset beach -- Tofu, bruine rijst, slamix, Fitchens currydressing single_choice bowl_wrap single_choice size single_choice veggie_on_veggie_dish @@ -105,7 +105,7 @@ base sunset_beach: Sunset beach -- Tofu, bruine rijst, slamix, Fitchens currydre multi_choice extra_protein multi_choice extra_vegs -base vegan_fitalian: Vegan fitalian -- Babyspinazie, volkorenpasta, vegan tomatensaus, tofu, kerstomaten, vegan kaas +dish vegan_fitalian: Vegan fitalian -- Babyspinazie, volkorenpasta, vegan tomatensaus, tofu, kerstomaten, vegan kaas single_choice bowl_wrap single_choice size single_choice veggie_on_vegan_dish @@ -114,7 +114,7 @@ base vegan_fitalian: Vegan fitalian -- Babyspinazie, volkorenpasta, vegan tomate multi_choice extra_protein multi_choice extra_vegs -base hot_tempeh: Hot tempeh -- Gekruide tempeh, quinoa, slamix, Fitchens spicy dressing +dish hot_tempeh: Hot tempeh -- Gekruide tempeh, quinoa, slamix, Fitchens spicy dressing single_choice bowl_wrap single_choice size single_choice veggie_on_veggie_dish @@ -123,7 +123,7 @@ base hot_tempeh: Hot tempeh -- Gekruide tempeh, quinoa, slamix, Fitchens spicy d multi_choice extra_protein multi_choice extra_vegs -base indian_summer: Indian summer -- Kip, bruine rijst, slamix, Fitchens currydressing +dish indian_summer: Indian summer -- Kip, bruine rijst, slamix, Fitchens currydressing single_choice bowl_wrap single_choice size single_choice veggie @@ -132,7 +132,7 @@ base indian_summer: Indian summer -- Kip, bruine rijst, slamix, Fitchens currydr multi_choice extra_protein multi_choice extra_vegs -base spicy_chicken: Spicy chicken -- Kip, quinoa, slamix, Fitchens spicy dressing +dish spicy_chicken: Spicy chicken -- Kip, quinoa, slamix, Fitchens spicy dressing single_choice bowl_wrap single_choice size single_choice veggie @@ -141,7 +141,7 @@ base spicy_chicken: Spicy chicken -- Kip, quinoa, slamix, Fitchens spicy dressin multi_choice extra_protein multi_choice extra_vegs -base avocado_chick: Avocado chick -- Kip, zoete aardappel, ijsbergsla, paprika, avocado, parmezaan, maïs, Fitchens mosterddressing +dish avocado_chick: Avocado chick -- Kip, zoete aardappel, ijsbergsla, paprika, avocado, parmezaan, maïs, Fitchens mosterddressing single_choice bowl_wrap single_choice size single_choice veggie @@ -150,7 +150,7 @@ base avocado_chick: Avocado chick -- Kip, zoete aardappel, ijsbergsla, paprika, multi_choice extra_protein multi_choice extra_vegs -base olive_garden: Olive garden -- Kip, volkorenpasta, babyspinazie, kerstomaten, parmezaan, zwarte olijven, Fitchens basilicum-pestodressing +dish olive_garden: Olive garden -- Kip, volkorenpasta, babyspinazie, kerstomaten, parmezaan, zwarte olijven, Fitchens basilicum-pestodressing single_choice bowl_wrap single_choice size single_choice veggie @@ -159,7 +159,7 @@ base olive_garden: Olive garden -- Kip, volkorenpasta, babyspinazie, kerstomaten multi_choice extra_protein multi_choice extra_vegs -base spicy_mexican: Spicy Mexican -- Mager rundvlees, quinoa, ijsbergsla, avocado, parmezaan, maïs, paprika, Fitchens spicy dressing +dish spicy_mexican: Spicy Mexican -- Mager rundvlees, quinoa, ijsbergsla, avocado, parmezaan, maïs, paprika, Fitchens spicy dressing single_choice bowl_wrap single_choice size single_choice veggie @@ -168,7 +168,7 @@ base spicy_mexican: Spicy Mexican -- Mager rundvlees, quinoa, ijsbergsla, avocad multi_choice extra_protein multi_choice extra_vegs -base fitalian: Fitalian -- Mager rundvlees, volkorenpasta, tomatensaus met groenten, parmezaan, Fitchens basilicum-pestodressing +dish fitalian: Fitalian -- Mager rundvlees, volkorenpasta, tomatensaus met groenten, parmezaan, Fitchens basilicum-pestodressing single_choice bowl_wrap single_choice size single_choice veggie @@ -177,7 +177,7 @@ base fitalian: Fitalian -- Mager rundvlees, volkorenpasta, tomatensaus met groen multi_choice extra_protein multi_choice extra_vegs -base iron_man: Iron man -- Mager rundvlees, volkorenpasta, kerstomaten, parmezaan, zwarte olijven, babyspinazie, Fitchens basilicum-pestodressing +dish iron_man: Iron man -- Mager rundvlees, volkorenpasta, kerstomaten, parmezaan, zwarte olijven, babyspinazie, Fitchens basilicum-pestodressing single_choice bowl_wrap single_choice size single_choice veggie @@ -186,7 +186,7 @@ base iron_man: Iron man -- Mager rundvlees, volkorenpasta, kerstomaten, parmezaa multi_choice extra_protein multi_choice extra_vegs -base beefcake: Beefcake -- Mager rundvlees, zoete aardappel, slamix, Fitchens mosterddressing +dish beefcake: Beefcake -- Mager rundvlees, zoete aardappel, slamix, Fitchens mosterddressing single_choice bowl_wrap single_choice size single_choice veggie @@ -195,7 +195,7 @@ base beefcake: Beefcake -- Mager rundvlees, zoete aardappel, slamix, Fitchens mo multi_choice extra_protein multi_choice extra_vegs -base slim_fish: Slim fish -- Gerookte zalm, bruine rijst, babyspinazie, radijs, edamamebonen, komkommer, maïs, avocado, sesamzaad, Fitchens spicy dressing +dish slim_fish: Slim fish -- Gerookte zalm, bruine rijst, babyspinazie, radijs, edamamebonen, komkommer, maïs, avocado, sesamzaad, Fitchens spicy dressing single_choice bowl_wrap single_choice size single_choice veggie @@ -204,7 +204,7 @@ base slim_fish: Slim fish -- Gerookte zalm, bruine rijst, babyspinazie, radijs, multi_choice extra_protein multi_choice extra_vegs -base captain: Captain -- Gerookte zalm, volkorenpasta, witte ui, babyspinazie, kerstomaten, Fitchens basilicum-pestodressing +dish captain: Captain -- Gerookte zalm, volkorenpasta, witte ui, babyspinazie, kerstomaten, Fitchens basilicum-pestodressing single_choice bowl_wrap single_choice size single_choice veggie diff --git a/data/fritoloog.hlds b/data/fritoloog.hlds index 74b909d..1884526 100644 --- a/data/fritoloog.hlds +++ b/data/fritoloog.hlds @@ -3,7 +3,7 @@ fritoloog: Fritoloog osm https://www.openstreetmap.org/node/5813542646 ============================ -base fries: Frietjes :: {has_meat} +dish fries: Frietjes :: {has_meat} # Gebakken in rundsvet dus {has_meat} single_choice size: Formaat @@ -14,7 +14,7 @@ base fries: Frietjes :: {has_meat} multi_choice sauce € 1.4 -base standalone_sauce: Saus in potje € 0.8 +dish standalone_sauce: Saus in potje € 0.8 single_choice sauce sauce: Saus @@ -27,59 +27,59 @@ sauce: Saus extra_cheese: Extra kaas € 0.2 # FIXME extra kaas waarop? -base chicken_fingers: Kippenvingers :: {has_meat} € 3 -base nuggiz: Nuggiz :: {has_meat} € 3 -base mammoth_sausage: Mammoetworst :: {has_meat} € 2.1 -base taco: Taco :: {has_meat} € 2.5 -base ragoezi: Ragoezi :: {has_meat} € 2 -base gypsy_stick: Zigeunerstick :: {has_meat} € 2 -base frikandel: Frikandel :: {has_meat} € 1.5 -base frikandel_special: Frikandel special :: {has_meat} € 2.2 -base frikandel_xxl: XXL Frikandel :: {has_meat} € 3 -base viandel: Viandel :: {has_meat} € 1.8 -base viandel_spicy: Spicy-viandel :: {has_meat} € 1.8 -base chicken_corn: Kipcorn :: {has_meat} € 1.8 -base sito: Sito :: {has_meat} € 2.7 -base horse_garlic_sausage: Paardenlookworst :: {has_meat} € 2.4 -base garlic_sausage: Lookworst :: {has_meat} € 2.4 -base bitterbal: Bitterbal :: {has_meat} € 1.5 -base boulet: Boulet :: {has_meat} € 1.8 -base chicken_spring_roll: Kippenloempia :: {has_meat} € 3 -base meat_croquette: Vleeskroket :: {has_meat} € 1.8 -base chicken_drumsticks: Kippenboutjes :: {has_meat} € 3.2 -base fire_breather: Vuurvreter :: {has_meat} € 2 -base mexicano: Mexicano :: {has_meat} € 2.4 -base ardeens_satay: Ardeense saté :: {has_meat} € 2.5 -base satay: Saté :: {has_meat} € 2.7 -base grisley: Grisley :: {has_meat} € 2.7 -base flemish_stew: Stoofvlees :: {has_meat} € 4.5 -base meatballs_tomato_sauce: Balletjes in tomatensaus :: {has_meat} € 4.5 -base hamburger: Hamburger :: {has_meat} € 2.6 -base cheeseburger: Cheeseburger :: {has_meat} € 2.9 -base chicken_burger: Chickenburger :: {has_meat} € 3.2 -base bicky_burger: Bickyburger :: {has_meat} € 2.9 -base bicky_rib: Bicky Rib :: {has_meat} € 3.5 -base bicky_royal: Bicky Royal :: {has_meat} € 4.3 -base bicky_chicken: Bicky Chicken :: {has_meat} € 3.2 -base bicky_wrap: Bicky Wrap :: {has_meat} € 3 -base assortment: Twijfelaar :: {has_meat} € 3 +dish chicken_fingers: Kippenvingers :: {has_meat} € 3 +dish nuggiz: Nuggiz :: {has_meat} € 3 +dish mammoth_sausage: Mammoetworst :: {has_meat} € 2.1 +dish taco: Taco :: {has_meat} € 2.5 +dish ragoezi: Ragoezi :: {has_meat} € 2 +dish gypsy_stick: Zigeunerstick :: {has_meat} € 2 +dish frikandel: Frikandel :: {has_meat} € 1.5 +dish frikandel_special: Frikandel special :: {has_meat} € 2.2 +dish frikandel_xxl: XXL Frikandel :: {has_meat} € 3 +dish viandel: Viandel :: {has_meat} € 1.8 +dish viandel_spicy: Spicy-viandel :: {has_meat} € 1.8 +dish chicken_corn: Kipcorn :: {has_meat} € 1.8 +dish sito: Sito :: {has_meat} € 2.7 +dish horse_garlic_sausage: Paardenlookworst :: {has_meat} € 2.4 +dish garlic_sausage: Lookworst :: {has_meat} € 2.4 +dish bitterbal: Bitterbal :: {has_meat} € 1.5 +dish boulet: Boulet :: {has_meat} € 1.8 +dish chicken_spring_roll: Kippenloempia :: {has_meat} € 3 +dish meat_croquette: Vleeskroket :: {has_meat} € 1.8 +dish chicken_drumsticks: Kippenboutjes :: {has_meat} € 3.2 +dish fire_breather: Vuurvreter :: {has_meat} € 2 +dish mexicano: Mexicano :: {has_meat} € 2.4 +dish ardeens_satay: Ardeense saté :: {has_meat} € 2.5 +dish satay: Saté :: {has_meat} € 2.7 +dish grisley: Grisley :: {has_meat} € 2.7 +dish flemish_stew: Stoofvlees :: {has_meat} € 4.5 +dish meatballs_tomato_sauce: Balletjes in tomatensaus :: {has_meat} € 4.5 +dish hamburger: Hamburger :: {has_meat} € 2.6 +dish cheeseburger: Cheeseburger :: {has_meat} € 2.9 +dish chicken_burger: Chickenburger :: {has_meat} € 3.2 +dish bicky_burger: Bickyburger :: {has_meat} € 2.9 +dish bicky_rib: Bicky Rib :: {has_meat} € 3.5 +dish bicky_royal: Bicky Royal :: {has_meat} € 4.3 +dish bicky_chicken: Bicky Chicken :: {has_meat} € 3.2 +dish bicky_wrap: Bicky Wrap :: {has_meat} € 3 +dish assortment: Twijfelaar :: {has_meat} € 3 -base chili_cheese: Chili cheese :: {has_meat} € 2.7 +dish chili_cheese: Chili cheese :: {has_meat} € 2.7 # FIXME zit hier vlees in? -base fish_burger: Fishburger :: {has_fish} € 3 -base cod_stick: Kabeljauwstick :: {has_fish} € 2.5 -base shrimp_croquette: Garnaalkroket :: {has_fish} € 2 +dish fish_burger: Fishburger :: {has_fish} € 3 +dish cod_stick: Kabeljauwstick :: {has_fish} € 2.5 +dish shrimp_croquette: Garnaalkroket :: {has_fish} € 2 -base mozarella_sticks: Mozarellasticks € 3 -base cheese_croquette: Kaaskroket € 1.5 -base veggi_burger: Veggieburger € 3.2 -base cheese_souflesse: Kaassouflesse € 1.5 +dish mozarella_sticks: Mozarellasticks € 3 +dish cheese_croquette: Kaaskroket € 1.5 +dish veggi_burger: Veggieburger € 3.2 +dish cheese_souflesse: Kaassouflesse € 1.5 # https://www.vangeloven.com/merk/souflesse -base bonita: Bonita € 2 +dish bonita: Bonita € 2 # https://www.devriesvanoers.nl/assortiment/specialiteiten/vegetarisch-groentesnack-vries-bonita/ -base sajoera: Sajoera € 2 +dish sajoera: Sajoera € 2 # https://www.devriesvanoers.nl/assortiment/specialiteiten/vegetarisch-groentekroket-vries-sajoera/ -base veg_cheese_disc: Groenten-kaasschijf € 2.4 -base mini_spring_rolls: Mini-loempia's € 3 -base bami: Bami € 2 +dish veg_cheese_disc: Groenten-kaasschijf € 2.4 +dish mini_spring_rolls: Mini-loempia's € 3 +dish bami: Bami € 2 diff --git a/data/oceangarden.hlds b/data/oceangarden.hlds index 01dc620..2159dbb 100644 --- a/data/oceangarden.hlds +++ b/data/oceangarden.hlds @@ -50,17 +50,17 @@ maybe_meat_no_duck: Vlees # Studentenwok 1 en 4 zijn eigenlijk hetzelfde -base wok1_4: Studentenwok met saus € 6 +dish wok1_4: Studentenwok met saus € 6 single_choice bami_nasi single_choice maybe_meat_no_duck -base wok2: Studentenwok kip/varken bami/mihoen zonder saus € 6 +dish wok2: Studentenwok kip/varken bami/mihoen zonder saus € 6 single_choice bami_mihoen single_choice meat_no_duck -base wok3: Studentenwok kip bami/nasi zonder saus :: {has_meat} € 6 +dish wok3: Studentenwok kip bami/nasi zonder saus :: {has_meat} € 6 single_choice bami_nasi -base wok5: Studentenwok Babi Pangang -- Geroosterd varkensvlees :: {has_meat} € 6 +dish wok5: Studentenwok Babi Pangang -- Geroosterd varkensvlees :: {has_meat} € 6 single_choice bami_nasi single_choice sauce diff --git a/data/oceangarden_future_syntax.hlds-disabled b/data/oceangarden_future_syntax.hlds-disabled index 63041ab..102d93f 100644 --- a/data/oceangarden_future_syntax.hlds-disabled +++ b/data/oceangarden_future_syntax.hlds-disabled @@ -55,28 +55,28 @@ maybe_meat: Vlees # Studentenwok 1 en 4 zijn eigenlijk hetzelfde -base wok1_4: Studentenwok met saus € 6 +dish wok1_4: Studentenwok met saus € 6 single_choice carbs except mihoen single_choice maybe_meat except duck -base wok2: Studentenwok kip/varken bami/mihoen zonder saus € 6 +dish wok2: Studentenwok kip/varken bami/mihoen zonder saus € 6 single_choice carbs except nasi single_choice meat only chicken, pork -base wok3: Studentenwok kip bami/nasi zonder saus € 6 +dish wok3: Studentenwok kip bami/nasi zonder saus € 6 single_choice bami_nasi single_choice meat only chicken -base wok5: Studentenwok Babi Pangang -- Geroosterd varkensvlees :: {has_meat} € 6 +dish wok5: Studentenwok Babi Pangang -- Geroosterd varkensvlees :: {has_meat} € 6 single_choice bami_nasi single_choice sauce -base veggie: VEGETARISCH-PURISTISCH demo-entry waarbij je ENKEL VEGGIE kan kiezen = LETTERLIJIK HET BESTE € 6 +dish veggie: VEGETARISCH-PURISTISCH demo-entry waarbij je ENKEL VEGGIE kan kiezen = LETTERLIJIK HET BESTE € 6 single_choice carbs single_choice sauce except {has_fish} diff --git a/etc/emacs/hlds-mode.el b/etc/emacs/hlds-mode.el index 436d40f..6a2182c 100644 --- a/etc/emacs/hlds-mode.el +++ b/etc/emacs/hlds-mode.el @@ -19,7 +19,7 @@ (let* ( ;; define several category of keywords (x-keywords '()) - (x-types '("base")) + (x-types '("dish")) (x-constants '()) (x-events '()) (x-functions '("single_choice" "multi_choice")) diff --git a/etc/vim/syntax.vim b/etc/vim/syntax.vim index 8d55baf..f9d2629 100644 --- a/etc/vim/syntax.vim +++ b/etc/vim/syntax.vim @@ -19,7 +19,7 @@ syn region hldsLocationHeader matchgroup=hldsLocationHeaderDelim \ start="^====*$" end="^====*$" \ contains=hldsLocationAttribute,hldsComment -syn keyword hldsBlockType base nextgroup=hldsBlockIdAftrKywrd skipwhite +syn keyword hldsBlockType dish nextgroup=hldsBlockIdAftrKywrd skipwhite syn keyword hldsChoiceType single_choice multi_choice nextgroup=hldsBlockIdAftrKywrd skipwhite syn match hldsBlockId "^[a-z0-9_-]\+: "