elpi 3.0

Author: gares

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+### 0.2.11
+
+- Syntax for Elpi 3.0
+
 ### 0.2.10
 
 - Fix tracer default options for elpi 2.x

elpiLexicalConventions.js

@@ -79,7 +79,7 @@ module.exports = {
     "wbl" : function() { return neg_lookbehind(or_set(idchar,it("[.]")))(); },
 
     "6" : "very loose definition of a type expressiong",
-    "typechars" : function() { return plus(or(it("[^,\\\\.%]"),nsid))(); },
+    "typechars" : function() { return plus(or(it("[^,\\\\. %]")),nsid)(); },
 
     "99" : "eof"
 }

syntaxes/elpi.tmLanguage.json

@@ -179,7 +179,7 @@
 		},
 		"pred-declaration": {
 			"name": "pred.declaration",
-			"begin": "((external)?\\s*(pred|func))\\s+((([a-z](([a-zA-Z0-9+*/^<>`'?@#~=&!\\-$_]|(\\.([a-z]|[A-Z]))))*)|([+*/^<>`'?@#~=&!](([a-z]|[A-Z]|[0-9]|[+*/^<>`'?@#~=&!\\-$_]|:))*)|(-([a-zA-Z0-9+*/^<>`'?@#~=&!\\-$_]([a-zA-Z0-9+*/^<>`'?@#~=&!\\-$_])*)))|(\\((( |\\t))*(([a-z](([a-zA-Z0-9+*/^<>`'?@#~=&!\\-$_]|(\\.([a-z]|[A-Z]))))*)|([+*/^<>`'?@#~=&!](([a-z]|[A-Z]|[0-9]|[+*/^<>`'?@#~=&!\\-$_]|:))*)|(-([a-zA-Z0-9+*/^<>`'?@#~=&!\\-$_]([a-zA-Z0-9+*/^<>`'?@#~=&!\\-$_])*)))(( |\\t))*\\)))",
+			"begin": "((external)?\\s*(pred|func|symbol))\\s+((([a-z](([a-zA-Z0-9+*/^<>`'?@#~=&!\\-$_]|(\\.([a-z]|[A-Z]))))*)|([+*/^<>`'?@#~=&!](([a-z]|[A-Z]|[0-9]|[+*/^<>`'?@#~=&!\\-$_]|:))*)|(-([a-zA-Z0-9+*/^<>`'?@#~=&!\\-$_]([a-zA-Z0-9+*/^<>`'?@#~=&!\\-$_])*)))|(\\((( |\\t))*(([a-z](([a-zA-Z0-9+*/^<>`'?@#~=&!\\-$_]|(\\.([a-z]|[A-Z]))))*)|([+*/^<>`'?@#~=&!](([a-z]|[A-Z]|[0-9]|[+*/^<>`'?@#~=&!\\-$_]|:))*)|(-([a-zA-Z0-9+*/^<>`'?@#~=&!\\-$_]([a-zA-Z0-9+*/^<>`'?@#~=&!\\-$_])*)))(( |\\t))*\\)))\\s*:?",
 			"end": "(?<=\\.\\s)",
 			"beginCaptures": {
 				"1": {
@@ -195,32 +195,26 @@
 					"name": "entity.name.function"
 				}
 			},
+			"endCaptures": {
+				"1": {
+					"name": "keyword.control.elpi"
+				}
+			},
 			"patterns": [
 				{
-					"begin": "(?<![a-zA-Z0-9+*/^<>`'?@#~=&!\\-$_.])(i:|o:)",
-					"end": "(,|\\.\\s)",
-					"beginCaptures": {
-						"1": {
-							"name": "entity.name.tag"
-						}
-					},
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.elpi"
-						}
-					},
-					"patterns": [
-						{
-							"include": "#comments"
-						},
-						{
-							"match": "(([^,\\.%]|(\\.([a-z]|[A-Z])))(([^,\\.%]|(\\.([a-z]|[A-Z]))))*)",
-							"name": "entity.name.type"
-						}
-					]
+					"include": "#comments"
 				},
 				{
-					"include": "#comments"
+					"match": "(->|func|pred|,|\\(|\\))",
+					"name": "keyword.control.elpi"
+				},
+				{
+					"match": "(i:|o:)",
+					"name": "entity.name.tag"
+				},
+				{
+					"match": "(([^,\\. %])(([^,\\. %]))*)",
+					"name": "entity.name.type"
 				}
 			]
 		},
@@ -301,7 +295,7 @@
 					},
 					"patterns": [
 						{
-							"match": "(([^,\\.%]|(\\.([a-z]|[A-Z])))(([^,\\.%]|(\\.([a-z]|[A-Z]))))*)",
+							"match": "(([^,\\. %])(([^,\\. %]))*)",
 							"name": "entity.name.type"
 						},
 						{
@@ -327,7 +321,7 @@
 			},
 			"patterns": [
 				{
-					"match": "(([^,\\.%]|(\\.([a-z]|[A-Z])))(([^,\\.%]|(\\.([a-z]|[A-Z]))))*)",
+					"match": "(([^,\\. %])(([^,\\. %]))*)",
 					"name": "entity.name.type"
 				},
 				{

syntaxes/elpi.tmLanguage.mustache

@@ -179,7 +179,7 @@
 		},
 		"pred-declaration": {
 			"name": "pred.declaration",
-			"begin": "((external)?\\s*(pred|func))\\s+({{{ident}}}|{{{infix}}})",
+			"begin": "((external)?\\s*(pred|func|symbol))\\s+({{{ident}}}|{{{infix}}})\\s*:?",
 			"end": "(?<=\\.\\s)",
 			"beginCaptures": {
 				"1": {
@@ -195,32 +195,26 @@
 					"name": "entity.name.function"
 				}
 			},
+			"endCaptures": {
+				"1": {
+					"name": "keyword.control.elpi"
+				}
+			},
 			"patterns": [
 				{
-					"begin": "{{{wbl}}}(i:|o:)",
-					"end": "(,|\\.\\s)",
-					"beginCaptures": {
-						"1": {
-							"name": "entity.name.tag"
-						}
-					},
-					"endCaptures": {
-						"1": {
-							"name": "keyword.control.elpi"
-						}
-					},
-					"patterns": [
-						{
-							"include": "#comments"
-						},
-						{
-							"match": "{{{typechars}}}",
-							"name": "entity.name.type"
-						}
-					]
+					"include": "#comments"
 				},
 				{
-					"include": "#comments"
+					"match": "(->|func|pred|,|\\(|\\))",
+					"name": "keyword.control.elpi"
+				},
+				{
+					"match": "(i:|o:)",
+					"name": "entity.name.tag"
+				},
+				{
+					"match": "{{{typechars}}}",
+					"name": "entity.name.type"
 				}
 			]
 		},