From e54519611bf937fbbe5b20ccaea2d56c49d5bda0 Mon Sep 17 00:00:00 2001
From: Andrey <50486086+DarkCat09@users.noreply.github.com>
Date: Wed, 28 Jul 2021 13:04:21 +0400
Subject: [PATCH] Changing langs format

---
 langs/bash.json    | 19 ++++++++++++-------
 langs/diff.json    | 11 ++++++++---
 langs/unidiff.json | 10 ++++++++++
 3 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 langs/unidiff.json

diff --git a/langs/bash.json b/langs/bash.json
index b8cd78a..0467a23 100644
--- a/langs/bash.json
+++ b/langs/bash.json
@@ -1,9 +1,14 @@
 {
-	"comment": "#.+$",
-	"oper": "[+\\-<>!=`\\|&\\[\\]\\(\\):]",
-	"cmd": "(?:^\\w+)|(?:`\\w+?`)|(?:$\\(\\w+?\\))|(?:\\|.*?\\w+)",
-	"var": "(?:${\\w+?})|(?:$\\w+)",
-	"num": "(?:\\d+?\\.\\d+)|(?:\\d+)",
-	"str": "[\\'\\\"].+?[\\'\\\"]",
-	"kw": "if|elif|else|fi|case|esac|set|let",
+	"lang": {
+		"delim": ["[\\r\\n]",";","&&","\\|\\|","\\|"],
+		"strdelim": "[\"']"
+	},
+	"comment": "(#.+)$",
+	"oper": "([+\\-<>!=`\\|&\\[\\]\\(\\):])",
+	"cmd": "(?:^(\\w+))|(?:`(\\w+).*`)|(?:\\$\\((\\w+)\\))",
+	"var": "((?:\\${\\w+?})|(?:\\$\\w+))",
+	"num": "((?:\\d+?\\.\\d+)|(?:\\d+))",
+	"str": "(['\"].*?['\"])",
+	"kw": "(echo|printf|read|pushd|popd|dirs|if|elif|else|fi|case|esac|set|let|eval)",
+	"shebang": "(#!.+$)"
 }
diff --git a/langs/diff.json b/langs/diff.json
index 3f1378f..cb2fcfd 100644
--- a/langs/diff.json
+++ b/langs/diff.json
@@ -1,5 +1,10 @@
 {
-	"diff-i": "^\\+.*$",
-	"diff-d": "^\\-.*$",
-	"diff-c": "^@@ -\\d+?,\\d+? \\+\\d+?,\\d+? @@"
+	"lang": {
+		"delim": ["\\d(?:,\\d)*[acd]\\d(?:,\\d)*\\s*"]
+	},
+	"lexemes": {
+		"diff-i": "(>[\\s\\S]+)",
+		"diff-d": "(<[\\s\\S]+)",
+		"diff-c": "(<[\\s\\S]+?---\\s*>[\\s\\S]+)"
+	}
 }
diff --git a/langs/unidiff.json b/langs/unidiff.json
new file mode 100644
index 0000000..d743cf1
--- /dev/null
+++ b/langs/unidiff.json
@@ -0,0 +1,10 @@
+{
+	"lang": {
+		"delim": ["\\n"]
+	},
+	"lexemes": {
+		"diff-i": "^(\\+.*$)",
+		"diff-d": "^(\\-.*$)",
+		"diff-c": "^(@@ -\\d+?,\\d+? \\+\\d+?,\\d+? @@)"
+	}
+}