From d7c6cada32ed4c8605c19dbfe5de83aedc4bef42 Mon Sep 17 00:00:00 2001 From: 0x4261756D <38735823+0x4261756D@users.noreply.github.com> Date: Wed, 11 Jan 2023 03:02:10 +0100 Subject: [PATCH] remove decrease intrinsic+update editor support --- editor/micro/kurz.yaml | 2 +- editor/vscode/kurz-lang/icons/kurz-dark.png | Bin 0 -> 760 bytes editor/vscode/kurz-lang/icons/kurz-light.png | Bin 0 -> 743 bytes editor/vscode/kurz-lang/package.json | 6 +++++- .../kurz-lang/syntaxes/kurz.tmLanguage.json | 2 +- src/main.rs | 6 ------ 6 files changed, 7 insertions(+), 9 deletions(-) create mode 100644 editor/vscode/kurz-lang/icons/kurz-dark.png create mode 100644 editor/vscode/kurz-lang/icons/kurz-light.png diff --git a/editor/micro/kurz.yaml b/editor/micro/kurz.yaml index 0ae4d46..287a49a 100644 --- a/editor/micro/kurz.yaml +++ b/editor/micro/kurz.yaml @@ -24,6 +24,6 @@ rules: - type: "\\b(bool|int|str)\\b" - symbol.operator: "([-+<>]|==|!=|=>|print(ln)?)" - identifier: "\\b(if|else|while)\\b" - - special: "\\b(deq|swp|dup|req|depth|decrease)\\b" + - special: "\\b(deq|swp|dup|req|depth)\\b" - special: "\\?\\?\\?" - statement: "arr" \ No newline at end of file diff --git a/editor/vscode/kurz-lang/icons/kurz-dark.png b/editor/vscode/kurz-lang/icons/kurz-dark.png new file mode 100644 index 0000000000000000000000000000000000000000..f03868bdae556203207f79ef4d314ab63515135e GIT binary patch literal 760 zcmVEX>4Tx04R}tkvmAkP!xv$ri!8!2Rn##$WV2$i;6hbDionYs1;guFuCaqnlvOS zE{=k0!NJF3)xpJCR|i)?5PX2Rx;QDiNQvhrg%&X$INXo_p8s&}xq#59FwN?U1DbA| z>10C8=2pd?R|L>cIgW_TEMrcRQt*whd#a?ki}7Cmb$`ZynztAb5Q*c=Fm2)u;+aj` z;Ji;9W+hoAJ|~_qX+Yvft}7nDaW1+n@Sb5alb$CI6N|+TRyvrKOpSP&II3zo^%t@p ztDLtuYn2*n&B02xXfQ-uHk02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{007WQL_t(o!((6=1*2fFf)iq5|4)dC{in4#jL4j7i4_beLJlD}q*zFeQ*?)*i<1hN z20F2m90CIt1%xahHL()y08$Mk*C7K|5RC%50M!!|)CK5eH#rvHws^%zwQ_)37SqH5 zq*zR_C|% qOjaViZSjf`X7OmLHVQ@owE+Mp&VXo2ME}_U0000?P)EX>4Tx04R}tkvmAkP!xv$ri!8!2Rn##$WV2$i;6hbDionYs1;guFuCaqnlvOS zE{=k0!NJF3)xpJCR|i)?5PX2Rx;QDiNQvhrg%&X$INXo_p8s&}xq#59FwN?U1DbA| z>10C8=2pd?R|L>cIgW_TEMrcRQt*whd#a?ki}7Cmb$`ZynztAb5Q*c=Fm2)u;+aj` z;Ji;9W+hoAJ|~_qX+Yvft}7nDaW1+n@Sb5alb$CI6N|+TRyvrKOpSP&II3zo^%t@p ztDLtuYn2*n&B0Rcd4`jP+u02y>eSad^gZEa<4bO1wgWnpw> zWFU8GbZ8()Nlj2!fese{006&9L_t(o!|jz(4uc>JhFh{T5H2u|;Jp76;|O{I<00BT znV8K96&QQym-t`;et&3-0E+Uj1Zz21%dNkI`xhqnvGC~#0016~5sA@Gr=2niKInu2}6J zs3mR^Kq5{C@R48|Ofzv-4{Ra6^+1U@s|3?vz(;B#7EOVV1oOCJP4OX2j*p(yEGvpq Z!VA3DnKacv2vGn4002ovPDHLkV1k~JJU{>d literal 0 HcmV?d00001 diff --git a/editor/vscode/kurz-lang/package.json b/editor/vscode/kurz-lang/package.json index b6247ca..566d483 100644 --- a/editor/vscode/kurz-lang/package.json +++ b/editor/vscode/kurz-lang/package.json @@ -14,7 +14,11 @@ "id": "kurz", "aliases": ["kurz", "kurz"], "extensions": [".qbl"], - "configuration": "./language-configuration.json" + "configuration": "./language-configuration.json", + "icon": { + "light": "./icons/kurz-light.png", + "dark": "./icons/kurz-dark.png" + } }], "grammars": [{ "language": "kurz", diff --git a/editor/vscode/kurz-lang/syntaxes/kurz.tmLanguage.json b/editor/vscode/kurz-lang/syntaxes/kurz.tmLanguage.json index d7cbc0b..0256efe 100644 --- a/editor/vscode/kurz-lang/syntaxes/kurz.tmLanguage.json +++ b/editor/vscode/kurz-lang/syntaxes/kurz.tmLanguage.json @@ -45,7 +45,7 @@ }, { "name": "support.function.kurz", - "match": "\\b(deq|swp|dup|req|depth|decrease)\\b" + "match": "\\b(deq|swp|dup|req|depth)\\b" }, { "name": "keyword.control", diff --git a/src/main.rs b/src/main.rs index fa58b7d..04ea829 100644 --- a/src/main.rs +++ b/src/main.rs @@ -100,7 +100,6 @@ fn main() ("==", (Vec::from([Datatype::Int, Datatype::Int]), Vec::from([Datatype::Bool]))), ("!=", (Vec::from([Datatype::Int, Datatype::Int]), Vec::from([Datatype::Bool]))), ("&&", (Vec::from([Datatype::Bool, Datatype::Bool]), Vec::from([Datatype::Bool]))), - ("decrease", (Vec::from([Datatype::Int]), Vec::from([Datatype::Int]))), ]); let args: Vec = env::args().collect(); if args.len() < 2 @@ -901,11 +900,6 @@ fn interpret_program(operations: &Vec, queue: &mut Vec, funct let second = queue.remove(0).parse::().unwrap(); queue.push((first && second).to_string()); } - "decrease" => - { - let val = queue.remove(0).parse::().unwrap(); - queue.push((val - 1).to_string()); - } "println" => { output += format!("{}\n", queue.remove(0)).as_str();