From 143bbc4937c2a5cdf93fdca8a84d719f7b582890 Mon Sep 17 00:00:00 2001 From: Rhiannon Morris Date: Fri, 12 Jun 2020 18:12:26 +0200 Subject: [PATCH 1/6] haha oops --- syntax/beluga.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/beluga.vim b/syntax/beluga.vim index 89bd77e..b09ddab 100644 --- a/syntax/beluga.vim +++ b/syntax/beluga.vim @@ -1,7 +1,7 @@ if exists('b:current_syntax') finish endif -let b:current_syntax = 'maude' +let b:current_syntax = 'beluga' setlocal iskeyword=48-57,a-z,A-Z,!,$,&,',*,+,_,/,=,@,-,~,#,^ From c68c6ca349d28b51ecf657c410f0ef6ea0fcfa63 Mon Sep 17 00:00:00 2001 From: Rhiannon Morris Date: Fri, 12 Jun 2020 18:12:38 +0200 Subject: [PATCH 2/6] =?UTF-8?q?<-=20and=20=E2=86=90=20don't=20exist=20any?= =?UTF-8?q?=20more?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- syntax/beluga.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/beluga.vim b/syntax/beluga.vim index b09ddab..bedabea 100644 --- a/syntax/beluga.vim +++ b/syntax/beluga.vim @@ -5,7 +5,7 @@ let b:current_syntax = 'beluga' setlocal iskeyword=48-57,a-z,A-Z,!,$,&,',*,+,_,/,=,@,-,~,#,^ -syn match belArrowEtc /->\|=>\|→\|←\|⇒\||-#\?\|⊢\|\<=\>\|:/ +syn match belArrowEtc /->\|=>\|→\|⇒\||-#\?\|⊢\|\<=\>\|:/ hi def link belArrowEtc Function syn match belBrack /[()[\]{}.;,]\|\<\/\>\||-\@!/ From 1bec2fba303e5279dcf185bbe27a289a0065a12c Mon Sep 17 00:00:00 2001 From: Rhiannon Morris Date: Fri, 12 Jun 2020 19:53:46 +0200 Subject: [PATCH 3/6] add <> as brackets --- syntax/beluga.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/syntax/beluga.vim b/syntax/beluga.vim index bedabea..80288fc 100644 --- a/syntax/beluga.vim +++ b/syntax/beluga.vim @@ -8,8 +8,8 @@ setlocal iskeyword=48-57,a-z,A-Z,!,$,&,',*,+,_,/,=,@,-,~,#,^ syn match belArrowEtc /->\|=>\|→\|⇒\||-#\?\|⊢\|\<=\>\|:/ hi def link belArrowEtc Function -syn match belBrack /[()[\]{}.;,]\|\<\/\>\||-\@!/ -hi def link belBrack Delimiter +syn match belDelim /[()[\]{}.;,]\|\<\/\>\||-\@!\|<\|-\@/ +hi def link belDelim Delimiter syn match belComment /%\s.*$/ hi def link belComment Comment From 5f2b5effb324afcbc6244b21c50eb7e6b021877e Mon Sep 17 00:00:00 2001 From: Rhiannon Morris Date: Fri, 12 Jun 2020 19:53:59 +0200 Subject: [PATCH 4/6] add ^ as a substitution constant --- syntax/beluga.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/syntax/beluga.vim b/syntax/beluga.vim index 80288fc..24e3079 100644 --- a/syntax/beluga.vim +++ b/syntax/beluga.vim @@ -35,8 +35,8 @@ hi def link belTotal Special syn keyword belTrust trust hi def link belTrust Underlined -syn match belIdSubst /\.\./ -hi def link belIdSubst Constant +syn match belSubstConst /\.\.\|\^/ +hi def link belSubstConst Constant syn keyword belIdBlock some block hi def link belIdBlock Structure From bf53ca2423215fb8a98b8ad68b00a1ac54c4e078 Mon Sep 17 00:00:00 2001 From: Rhiannon Morris Date: Fri, 12 Jun 2020 19:54:15 +0200 Subject: [PATCH 5/6] add module keywords and qualified names --- syntax/beluga.vim | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/syntax/beluga.vim b/syntax/beluga.vim index 24e3079..77713cc 100644 --- a/syntax/beluga.vim +++ b/syntax/beluga.vim @@ -41,6 +41,12 @@ hi def link belSubstConst Constant syn keyword belIdBlock some block hi def link belIdBlock Structure +syn keyword belModule module struct end +hi def link belModule Structure + +syn match belQualName /\>::\ Date: Fri, 12 Jun 2020 19:54:25 +0200 Subject: [PATCH 6/6] flag <- and prop as errors --- syntax/beluga.vim | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/syntax/beluga.vim b/syntax/beluga.vim index 77713cc..130c078 100644 --- a/syntax/beluga.vim +++ b/syntax/beluga.vim @@ -77,3 +77,7 @@ hi def link belBool Boolean syn keyword belIf if then else hi def link belIf Keyword + +syn match belugaError /<-/ +syn keyword belugaError prop +hi def link belugaError Error