vis: update to 0.8

This commit is contained in:
dkwo 2022-11-12 12:17:22 -05:00 committed by Leah Neukirchen
parent 2428719023
commit 699e0c0081
2 changed files with 3 additions and 48 deletions

View File

@ -1,45 +0,0 @@
From e57851806592f5ea4ee48303b97a5f59731370c5 Mon Sep 17 00:00:00 2001
From: Silas <silas_git@nocafe.net>
Date: Tue, 8 Dec 2020 17:37:43 -0300
Subject: [PATCH] lexers: fix bug in bash lexer for last here-doc
f4f0f5b allowed "<<-EOF" heredocs to be parsed correctly, but it
introduced a bug that made the lexer fail when the beginning of a
here-doc was the last string in a file (optionally followed only
by blanks).
In order to fix this, move everything regarding "delimiter" within
the block that is executed only if "delimiter" is not nil.
---
lua/lexers/bash.lua | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/lua/lexers/bash.lua b/lua/lexers/bash.lua
index 4dc4cf6..7927b4a 100644
--- a/lua/lexers/bash.lua
+++ b/lua/lexers/bash.lua
@@ -20,15 +20,15 @@ local ex_str = l.delimited_range('`')
local heredoc = '<<' * P(function(input, index)
local s, e, minus, _, delimiter =
input:find('(-?)(["\']?)([%a_][%w_]*)%2[\n\r\f;]+', index)
- -- If the starting delimiter of a here-doc begins with "-", then
- -- spaces are allowed to come before the closing delimiter.
- local close_pattern
- if minus == '-' then
- close_pattern = '[\n\r\f%s]+'..delimiter..'\n'
- else
- close_pattern = '[\n\r\f]+'..delimiter..'\n'
- end
if s == index and delimiter then
+ -- If the starting delimiter of a here-doc begins with "-", then
+ -- spaces are allowed to come before the closing delimiter.
+ local close_pattern
+ if minus == '-' then
+ close_pattern = '[\n\r\f%s]+'..delimiter..'\n'
+ else
+ close_pattern = '[\n\r\f]+'..delimiter..'\n'
+ end
local _, e = input:find(close_pattern, e)
return e and e + 1 or #input + 1
end

View File

@ -1,7 +1,7 @@
# Template file for 'vis'
pkgname=vis
version=0.7
revision=2
version=0.8
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="acl-devel libtermkey-devel lua53-devel ncurses-devel"
@ -11,7 +11,7 @@ maintainer="Diogo Leal <diogo@diogoleal.com>"
license="ISC"
homepage="https://github.com/martanne/vis"
distfiles="https://github.com/martanne/vis/archive/v${version}.tar.gz"
checksum=359ebb12a986b2f4e2a945567ad7587eb7d354301a5050ce10d51544570635eb
checksum=61b10d40f15c4db2ce16e9acf291dbb762da4cbccf0cf2a80b28d9ac998a39bd
conflicts="outils" # /usr/bin/vis
post_install() {