summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Barri2020-12-07 11:02:56 +1100
committerDavid Barri2020-12-07 11:03:59 +1100
commit2b862f0cc5f4e4cec31501b99b02f494c18217a2 (patch)
tree689807479a5ac104bf3401b80d558e3ad9a37d3b
parent8b28ac3ecbf4a3c2dcd0a3d28dad307f85df1971 (diff)
downloadaur-2b862f0cc5f4e4cec31501b99b02f494c18217a2.tar.gz
More formatting
-rw-r--r--PKGBUILD2
-rwxr-xr-xtlc-colour20
2 files changed, 15 insertions, 7 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 64e7894d7c41..bac7b6b8f580 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,7 +29,7 @@ sha256sums=('8cce75caa1e59d0b0483bb8fb881ba33825edce8b2d98aba59d66ce685dd3d1a'
'1ed9e18cf3036f71ffb5f66ba53d4b13a46535ec6687185dd2b2f25a3aa2c051'
'8b87025166b15e93fd90803ba5165e505a4ee5e67d8f5e462276badd2443a16c'
'1a0dcaebefe29e330aaf6ac42da41cd8ad5059d5f10411abf2063d2ef68c87af'
- 'bb661b1c30aa343f1c34e9cf9a19f9abaf974e1b124a2c1311c470ba79bf5935'
+ 'a3e62459666f7c126bd47b746980f09769f1c905655b0948998287ec5077bd1f'
'3ae8122f331b3aa9cd1952571d4bbc58d98246ec2e6f58bdfa9ce973fa7afc87'
'fedb2f21d93526495ca4b8b6b10a6f37d6d4099d06a9203426b7c5f7c6996419'
'450b00da072989f41f8cec7e6fdf535d8acdc31472d9372071a1ce769b860073'
diff --git a/tlc-colour b/tlc-colour
index f5535a6f41bf..7d87537026f0 100755
--- a/tlc-colour
+++ b/tlc-colour
@@ -3,12 +3,20 @@
if [ $# -eq 0 ]; then
# Colour stdin
- exec perl -pe '
- s/^(Warning:.*)$/\e[30;43m$1\e[0m/;
- s/^(Error:(?! The behavior up to this point is).*|\*\*\*.*Error.*)$/\e[97;41m$1\e[0m/;
- s/^(State \d+: <)(\S+?)( line.+)$/\e[93m$1\e[0;30;43m$2\e[0;93m$3\e[0m/;
- s/^(State \d+:.*)$/\e[93m$1\e[0m/;
- s/^(Model checking completed. No error.*)$/\e[30;42m$1\e[0m/;
+ perl -0pe '
+
+ s/^(.?Warning:.*)$/\e[30;43m$1\e[0m/mg;
+ s/^(.?Error:(?! The behavior up to this point is).*|\*\*\*.*Error.*)$/\e[97;41m$1\e[0m/mg;
+ s/^(.*Attempted to select nonexistent field.*)$/\e[97;41m$1\e[0m/mg;
+ s/^(Lexical error at .*)$/\e[97;41m$1\e[0m/mg;
+ s/^(State \d+: <)(\S+?)( line.+)$/\e[93m$1\e[0;30;43m$2\e[0;93m$3\e[0m/mg;
+ s/^(State \d+:.*)$/\e[93m$1\e[0m/mg;
+ s/^(Model checking completed. No error.*)$/\e[30;42m$1\e[0m/mg;
+
+ #s/[Ll]ine (\d+?), col(?:umn)? (\d+)/$1:$2/g;
+ s/^(\d+\.) Line (\d+?), column (\d+?) to line (\d+?), column (\d+?)/$1 $2:$3 to $4:$5/mg;
+
+ s/^(The exception was .+?[\r\n]+.*?)$/\e[97;41m$1\e[0m/mg;
'
else