[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
trans-coord/gnun/server/gnun ChangeLog Makefile...
|
From: |
Ineiev |
|
Subject: |
trans-coord/gnun/server/gnun ChangeLog Makefile... |
|
Date: |
Wed, 9 Nov 2022 03:23:54 -0500 (EST) |
CVSROOT: /sources/trans-coord
Module name: trans-coord
Changes by: Ineiev <ineiev> 22/11/09 03:23:54
Modified files:
gnun/server/gnun: ChangeLog Makefile.am NEWS configure.ac
expand-ssi.awk.in make-prototype.awk
gnun/server/gnun/tests: make-prototype
gnun/server/gnun/tests/validate: 5.0.html 5.1.html match3.0.html
match3.1.html
Added files:
gnun/server/gnun/tests/validate: 6 6.html
Log message:
* expand-ssi.awk.in: #if expressions: add rudimentary support
for && and || operators, handle newlines and elementary expressions
more correctly.
* tests/make-prototype: Make sure no stderr output is produced.
* tests/validate/match3.0.html: Fix diagnostic message.
* tests/validate/match3.1.html:
* tests/validate/5.0.html:
* tests/validate/5.1.html: Update tests.
* tests/validate/6:
* tests/validate/6.html: New files.
* Makefile.am: Add tests for the new feature.
* NEWS: Update.
* configure.ac: Add missing output of test results; improve awk test.
* make-prototype.awk: Fix 'one true' awk compatibility issues.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.504&r2=1.505
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/Makefile.am?cvsroot=trans-coord&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.157&r2=1.158
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/configure.ac?cvsroot=trans-coord&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/expand-ssi.awk.in?cvsroot=trans-coord&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/make-prototype.awk?cvsroot=trans-coord&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/tests/make-prototype?cvsroot=trans-coord&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/tests/validate/5.0.html?cvsroot=trans-coord&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/tests/validate/5.1.html?cvsroot=trans-coord&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/tests/validate/match3.0.html?cvsroot=trans-coord&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/tests/validate/match3.1.html?cvsroot=trans-coord&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/tests/validate/6?cvsroot=trans-coord&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/tests/validate/6.html?cvsroot=trans-coord&rev=1.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.504
retrieving revision 1.505
diff -u -b -r1.504 -r1.505
--- ChangeLog 27 Dec 2021 10:43:47 -0000 1.504
+++ ChangeLog 9 Nov 2022 08:23:45 -0000 1.505
@@ -1,3 +1,20 @@
+2022-11-09 Pavel Kharitonov <ineiev@gnu.org>
+
+ * expand-ssi.awk.in: #if expressions: add rudimentary support
+ for && and || operators, handle newlines and elementary expressions
+ more correctly.
+ * tests/make-prototype: Make sure no stderr output is produced.
+ * tests/validate/match3.0.html: Fix diagnostic message.
+ * tests/validate/match3.1.html:
+ * tests/validate/5.0.html:
+ * tests/validate/5.1.html: Update tests.
+ * tests/validate/6:
+ * tests/validate/6.html: New files.
+ * Makefile.am: Add tests for the new feature.
+ * NEWS: Update.
+ * configure.ac: Add missing output of test results; improve awk test.
+ * make-prototype.awk: Fix 'one true' awk compatibility issues.
+
2021-12-27 Pavel Kharitonov <ineiev@gnu.org>
* gnun-validate-html.in: Check error output of xmllint as well as
@@ -4979,7 +4996,7 @@
бÑлгаÑÑки.
Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
- 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+ 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
This file is part of GNUnited Nations.
Index: Makefile.am
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/Makefile.am,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- Makefile.am 12 Dec 2021 17:33:20 -0000 1.51
+++ Makefile.am 9 Nov 2022 08:23:48 -0000 1.52
@@ -1,5 +1,5 @@
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014,
-# 2015, 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
+# 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
# This file is part of GNUnited Nations.
@@ -42,7 +42,8 @@
endif
endif
-validation_tests = validate/1 validate/2 validate/3 validate/4 validate/5
+validation_tests = validate/1 validate/2 validate/3 validate/4 validate/5 \
+ validate/6
tests_available += $(validation_tests)
if HAVE_MATCH3
@@ -234,6 +235,7 @@
tests/validate/3 tests/validate/3.0.html tests/validate/3.1.html \
tests/validate/4 tests/validate/4.0.html tests/validate/4.1.html \
tests/validate/5 tests/validate/5.0.html tests/validate/5.1.html \
+ tests/validate/6 tests/validate/6.html \
tests/validate/match3 tests/validate/match3.0.html \
tests/validate/match3.1.html
Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -b -r1.157 -r1.158
--- NEWS 27 Dec 2021 10:43:47 -0000 1.157
+++ NEWS 9 Nov 2022 08:23:48 -0000 1.158
@@ -1,13 +1,27 @@
-GNUnited Nations NEWS - User visible changes.
+GNUnited Nations NEWS - User-visible changes.
* Changes in GNUnited Nations 1.3 (????-??-??)
+* The SSI expansion function in gnun-validate-html rudimentarily
+ supports the || and && operators the #if directive; on the other hand,
+ substrings '||' and '&&' are not supported in quoted strings
+ (<!--#if expr="'a && b' != 'c || d'" --> works unlike in Apache).
+
** Bugs fixed in 1.3
*** Sometimes xmllint exits with zero code even when it finds some
kinds of errors; the new version of 'gnun-validate-html' checks
error output of xmllint to detect such cases.
+*** Newlines in #if expressions weren't handled correctly.
+
+*** The "!" #if expression is a special case in Apache, it was treated
+ in the opposite way.
+
+*** 'configure' didn't output the results of --enable-sort selection.
+
+*** make-prototype.awk didn't work with 'one true' awk.
+
* Changes in GNUnited Nations 1.2 (2021-12-12)
** When validating HTML, SSI variable expansion is closer to Apache behavior.
@@ -650,7 +664,7 @@
-----
Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
- 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+ 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
This file is part of GNUnited Nations.
Index: configure.ac
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/configure.ac,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- configure.ac 12 Dec 2021 17:33:20 -0000 1.60
+++ configure.ac 9 Nov 2022 08:23:48 -0000 1.61
@@ -55,6 +55,7 @@
[Disable sorting lists.])]
)
AS_CASE(["x$enable_sort"],[xno],,[enable_sort=yes])
+AC_MSG_RESULT([$enable_sort])
AC_MSG_CHECKING([whether `date' supports the `-d' option])
timestamp=`date -d "2001-09-09 01:47+0000" +%s 2> /dev/null || echo FAIL`
@@ -72,9 +73,12 @@
[
if(!match("abcdefg", /b((c)d)e(f)/, arr))
print "no match"
- if (arr[1] != "cd" || arr[2] != "c" || arr[3] != "f"\
- || arr[0] != "bcdef" || 4 in arr)
+ else if (
+ arr[1] != "cd" || arr[2] != "c" || arr[3] != "f"\
+ || arr[0] != "bcdef" || 4 in arr
+ )
print "wrong grouping"
+ else
print "OK"
], [OK], [match3=match], [match3=match_fallback])
AC_SUBST([MATCH3], [$match3])
Index: expand-ssi.awk.in
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/expand-ssi.awk.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- expand-ssi.awk.in 12 Dec 2021 17:33:20 -0000 1.5
+++ expand-ssi.awk.in 9 Nov 2022 08:23:48 -0000 1.6
@@ -1,28 +1,28 @@
#! @AWK@ -f
-
+#
# expand-ssi.awk: process Apache SSI directives.
-
+#
# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-# 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
-
+# 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
+#
# This file is part of GNUnited Nations.
-
+#
# GNUnited Nations is free software: you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
-
+#
# GNUnited Nations is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-
+#
# You should have received a copy of the GNU General Public License
# along with GNUnited Nations. If not, see <http://www.gnu.org/licenses/>.
-
+#
# The implementation is very limited,
-# e.g. `&&' and `||' in `if' expressions are not supported, as well as
-# many cases of quoting, multiple echo and assignments within a single
+# e.g. many cases of quoting in `if' expressions are not supported,
+# multiple echo and assignments within a single
# directive like <!--#set var="x" value="x" var="y" value="y" -->
# also don't work, CGI includes would be expanded in a wrong way &c.
@@ -90,9 +90,15 @@
{
begin = 1; end = match(vars[i] " ", /[^0-9a-zA-Z_]/); rest = end
}
- if(end <= begin)
+ if (end == begin)
{
- str = str unescape(unassigned_value(vars[i], unassigned)); continue
+ str = str "$" vars[i]
+ continue
+ }
+ if (end < begin)
+ {
+ str = str unescape(unassigned_value(vars[i], unassigned));
+ continue
}
var = substr(vars[i], begin, end - begin)
val = get_apache_var(var, unassigned)
@@ -177,16 +183,20 @@
}
}
+function trim(val)
+{
+ sub(/^[ \r\n\t]*/, "", val)
+ sub(/[ \r\n\t]*$/, "", val)
+ return val
+}
+
# Remove leading and trailing spaces, unquote, expand variables.
-function unquoted_var(str,
- val)
+function unquoted_var(str)
{
- val = str
- sub(/^[ \t]*/, "", val)
- sub(/[ \t]*$/, "", val)
- if(val ~ /^'.*'$/)
- val = unquote(val)
- return expand_var_value(val)
+ str = trim(str)
+ if (str ~ /^'.*'$/)
+ str = unquote(str)
+ return expand_var_value(str)
}
# Substituted in MATCH3 when match doesn't support third argument.
@@ -195,74 +205,105 @@
return match(arg1, arg2)
}
-# Evaluate condition from `<!--#if ... -->' directive.
-# Supported forms are "string", "!string", "string1 = string2",
-# "string1 == string2", "string1 != string2".
-# Other forms ("-A string", "string1 > string2", "expr1 && expr2" etc.)
-# are not supported.
-# Advanced quoting patterns like "' '${test}' ' = ' '"
-# are also not supported (use "' ${test} ' = ' '").
-function eval_expression(str,
- arr, lval, rval, negate, pattern_match, res, idx)
+# Evaluate an elementary `if' expression like "string" or "!string".
+function eval_string(str,
+ l, negate)
+{
+ str = trim(str)
+ if (str == "!") # Special case in Apache.
+ return 0
+ negate = 0
+ if (str ~ /^!/)
+ {
+ negate = 1
+ sub(/./, "", str)
+ }
+ l = length(unquoted_var(str))
+ if (negate)
+ return !l
+ return l
+}
+
+# Evaluate a simple `if' expression (without the || and && operators).
+function eval_term(str,
+ lval, rval, negate, pattern_match, res, idx)
{
# Escaped `$'s are treated the same way as unescaped in `if' expressions.
gsub(/\\\$/, "$", str)
idx = index(str, "=")
if(!idx)
- {
# No `=': we've got either "!string" or "string" kind of expression.
- if(str ~ /^[ \t]*!/)
- return !length(unquoted_var(substr(str, index(str, "!") + 1)))
- return length(unquoted_var(str))
- }
+ return eval_string(str)
if(idx > 1)
- arr[1] = substr(str, 1, idx - 1)
+ lval = substr(str, 1, idx - 1)
else
- arr[1] = ""
- arr[2] = substr(str, idx + 1)
+ lval = ""
+ rval = substr(str, idx + 1)
if(str ~ /!==/)
{
print my_name "bad expression `" str "'" > "/dev/stderr"
exit 1
}
# "string1 == string2" or "string1 != string2" or "string1 = string2" case.
- pattern_match = 0
negate = 0
- if(arr[2] ~ /^=/)
+ if (rval ~ /^=/)
{
- arr[2] = substr(arr[2], 2)
+ rval = substr(rval, 2)
negate = -1
}
- sub(/^[ \t]*/, "", arr[2])
- sub(/[ \t]*$/, "", arr[2])
- if(arr[2] ~ /^\/.*\/$/)
- {
- pattern_match = 1
- arr[2] = unquote(arr[2])
- }
- if(!negate && (arr[1] ~ /!$/))
+ rval = trim(rval)
+ pattern_match = (rval ~ /^\/.*\/$/)
+ if (!negate && (lval ~ /!$/))
{
negate = 1
- sub(/.$/, "", arr[1])
+ sub(/.$/, "", lval)
}
- lval = unquoted_var(arr[1])
- rval = arr[2]
- if(rval ~ /^'.*'$/ && !pattern_match)
- rval = unquote(rval)
- rval = expand_var_value(rval)
- if(pattern_match)
- {
+ lval = unquoted_var(lval)
+ if (pattern_match)
# Note: Apache manual says you can only capture parts of regexp
# with positive matching, but in fact the same is true for negative one.
- res = @MATCH3@(lval, rval, matched_array)
- }
+ res = \
+ @MATCH3@(lval, unquote(expand_var_value(rval, "name")), matched_array)
else
- res = (lval == rval)
+ res = (lval == unquoted_var(rval))
if(negate > 0)
return !res
return res
}
+# Evaluate condition from `<!--#if ... -->' directive.
+# Supported forms are "string", "!string", "string1 = string2",
+# "string1 == string2", "string1 != string2", "string1 = /string2/",
+# "string1 != /string2/", "expr1 && expr1 || expr3".
+# Other forms ("-A string", "string1 > string2", etc.)
+# are not supported.
+# Advanced quoting patterns like "' '${test}' ' = ' '"
+# are also not supported (use "' ${test} ' = ' '"), as well as
+# groupings with like "(expr1 || expr2) && expr3".
+# Furthermore, it's assumed that strings "||" and "&&" always mean
+# operators (no expressions like "'a && b' != 'c || d'").
+function eval_expression(str,
+ parts, n, i)
+{
+ if (str ~ /[|][|]/)
+ {
+ n = split(str, parts, /[|][|]/);
+ for (i = 1; i <= n; i++)
+ if (eval_expression(parts[i]))
+ return 1
+ return 0
+ }
+ if (str ~ /[&][&]/)
+ {
+ n = split(str, parts, /[&][&]/);
+ for (i = 1; i <= n; i++)
+ if (!eval_term(parts[i]))
+ return 0
+ return 1
+ }
+ return eval_term(str);
+}
+
# Find the end of the directive and check that
# no comment begins before the directive ends.
function directive_idx(str,
Index: make-prototype.awk
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/make-prototype.awk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- make-prototype.awk 12 Dec 2021 17:33:20 -0000 1.7
+++ make-prototype.awk 9 Nov 2022 08:23:50 -0000 1.8
@@ -2,7 +2,7 @@
# make-prototype.awk: generate `prototype' HTML.
# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-# 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
# This file is part of GNUnited Nations.
@@ -26,12 +26,14 @@
{ text = text $0 RT }
END {
-
-# Program's name to prepend error messages.
+ # Program name to prepend error messages.
my_name = "make-prototype.awk: "
- if (!match(text,
-/<title>.*<\/div>.*<div[\t\r\n ]+([^>]*[\t\r\n ])?id[\t\r\n ]*\
-=[\t\r\n ]*(("footer")|('footer'))[^>]*>/))
+
+ # As of 2022-11-07, 'one true' awk doesn't seem to support regular
+ # expressions split into lines with '\'.
+ regex = "<title>.*</div>.*<div[\t\r\n ]+([^>]*[\t\r\n ])?id[\t\r\n ]*" \
+ "=[\t\r\n ]*((\"footer\")|('footer'))[^>]*>"
+ if (!match(text, regex))
{
print my_name \
"`<title>' followed by `</div>' and `<div id=\"footer\"...>' not
found" \
Index: tests/make-prototype
===================================================================
RCS file:
/sources/trans-coord/trans-coord/gnun/server/gnun/tests/make-prototype,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/make-prototype 12 Dec 2021 17:33:21 -0000 1.2
+++ tests/make-prototype 9 Nov 2022 08:23:50 -0000 1.3
@@ -1,6 +1,6 @@
#! /bin/sh
# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-# 2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+# 2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
# This file is part of GNUnited Nations.
@@ -20,7 +20,13 @@
# Test the make-prototype script.
"$AWK" -f "${pkglibexecdir}/make-prototype.awk" \
- < "${srcdir}/proto.html" > proto.proto || exit 1
+ < "${srcdir}/proto.html" > proto.proto 2> proto.err || exit 1
diff "${srcdir}/proto.proto" proto.proto || exit 1
-rm proto.proto
+if test -s proto.err; then
+ # We don't want warnings, even when awk exits successfully.
+ echo "stderr messages:"
+ cat proto.err
+ exit 1
+fi
+rm proto.proto proto.err
exit 0
Index: tests/validate/5.0.html
===================================================================
RCS file:
/sources/trans-coord/trans-coord/gnun/server/gnun/tests/validate/5.0.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/validate/5.0.html 12 Dec 2021 17:33:22 -0000 1.2
+++ tests/validate/5.0.html 9 Nov 2022 08:23:50 -0000 1.3
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<!-- Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
This file is a part of GNUN testsuite.
@@ -35,5 +35,65 @@
wrong 'a == "a"' expression evaluation</p><!--#endif
--><!--#if expr='"a" == a' -->
wrong '"a" == a' expression evaluation</p><!--#endif
- --></body>
+ --><!--#if expr='
+
+"
+a
+"
+ =
+
+ "
+a
+"
+
+'
+--><!--#else -->
+wrong "\na\n" = "\na\n" expression evaluation</p>
+<!--#endif --><!--#if expr="
+
+'
+a
+'
+
+ =
+
+ /^
+a
+$/
+
+" --><!--#else -->
+wrong '\na\n'\n =\n /^\na\n$/ expression evaluation</p>
+<!--#endif --><!--#if expr="
+
+!
+
+
+" -->
+single "!" is wrongly considered true</p>
+<!--#endif --><!--#if expr="
+
+
+" -->
+wrong empty string evaluation</p>
+<!--#endif --><!--#if expr="
+
+''
+
+" -->
+wrong empty string evaluation (bis)</p>
+<!--#endif --><!--#if expr="
+
+!
+
+''
+
+" --><!--#else -->
+wrong empty string negation</p>
+<!--#endif --><!--#if expr="gnu,fs != /^((gnu)?,(banner|fs)?)$/"
+--><!--#set var="note"
+ value="mawk 1.3.3 coming with Trisquel 9.0 chokes on things like (gnu|)
+ as well as Kerninan's 'one true' awk (as of 2022-11-07),
+ as opposed to (gnu)?; mawk 1.3.4 20130803 and gawk don't." -->
+wrong regexp evaluation</p>
+<!--#endif --></body>
</html>
Index: tests/validate/5.1.html
===================================================================
RCS file:
/sources/trans-coord/trans-coord/gnun/server/gnun/tests/validate/5.1.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/validate/5.1.html 12 Dec 2021 17:33:22 -0000 1.2
+++ tests/validate/5.1.html 9 Nov 2022 08:23:52 -0000 1.3
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<!-- Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
This file is a part of GNUN testsuite.
Index: tests/validate/match3.0.html
===================================================================
RCS file:
/sources/trans-coord/trans-coord/gnun/server/gnun/tests/validate/match3.0.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/validate/match3.0.html 12 Dec 2021 17:33:23 -0000 1.2
+++ tests/validate/match3.0.html 9 Nov 2022 08:23:54 -0000 1.3
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<!-- Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
This file is a part of GNUN testsuite.
@@ -45,7 +45,7 @@
$0=<!--#echo encoding="none" var="0" --></p>
<!--#endif
--><!--#else -->
-wrong $1234567890 = /(1)(2)(3)(4)(5)(6)(7)(8)((9)(0))/ evaluation</p>
+wrong c1234567890ab = /(1)(2)(3)(4)(5)(6)(7)(8)((9)(0))/ evaluation</p>
<!--#endif
--><!--#if expr="abd != /(a(b))c/"
--><!--#if expr="$1" -->
Index: tests/validate/match3.1.html
===================================================================
RCS file:
/sources/trans-coord/trans-coord/gnun/server/gnun/tests/validate/match3.1.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests/validate/match3.1.html 12 Dec 2021 17:33:23 -0000 1.2
+++ tests/validate/match3.1.html 9 Nov 2022 08:23:54 -0000 1.3
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<!-- Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
-2016, 2017, 2018, 2019, 2020, 2021 Free Software Foundation, Inc.
+2016, 2017, 2018, 2019, 2020, 2021, 2022 Free Software Foundation, Inc.
This file is a part of GNUN testsuite.
Index: tests/validate/6
===================================================================
RCS file: tests/validate/6
diff -N tests/validate/6
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/validate/6 9 Nov 2022 08:23:54 -0000 1.1
@@ -0,0 +1,21 @@
+#! /bin/sh
+# Copyright (C) 2022 Free Software Foundation, Inc.
+
+# This file is part of GNUnited Nations.
+
+# GNUnited Nations is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+
+# GNUnited Nations is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNUnited Nations. If not, see <http://www.gnu.org/licenses/>.
+
+# Test expressions with binary operators && and ||.
+
+"${bindir}/gnun-validate-html" "${srcdir}/validate/6.html" || exit 1
Index: tests/validate/6.html
===================================================================
RCS file: tests/validate/6.html
diff -N tests/validate/6.html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ tests/validate/6.html 9 Nov 2022 08:23:54 -0000 1.1
@@ -0,0 +1,34 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<!-- Copyright (C) 2015, 2022 Free Software Foundation, Inc.
+
+This file is a part of GNUN testsuite.
+
+GNUnited Nations is free software: you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+GNUnited Nations is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNUnited Nations. If not, see <http://www.gnu.org/licenses/>. -->
+<title>title</title>
+</head>
+<body>
+<h2>Title</h2><!--#if expr="a = /b/ || c = /c|d/" --><!--#else -->
+wrong "a = /b/ || c = /c|d/" expression evaluation</p>
+<!--#endif --><!--#if expr="a = /a/ && c" --><!--#else -->
+wrong "a = /a/ || c" expression evaluation</p>
+<!--#endif --><!--#if expr="a = /b/ || 1 && 'a' == 'b'" -->
+wrong "a = /b/ || 1 && 'a' == 'b" expression evaluation</p>
+<!--#endif --><!--#if expr="a = /b/ && 1 || 'a' == 'b'" -->
+wrong "a = /b/ && 1 || 'a' == 'b" expression evaluation</p>
+<!--#endif --></body>
+</html>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- trans-coord/gnun/server/gnun ChangeLog Makefile...,
Ineiev <=