Mercurial > mxe-octave

annotate src/of-io-1-fixes.patch @ 6161:8fcac4d6d983 release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-queueing: Fix syntax error with Octave 7 (bug #62314). * src/of-queueing-1-octave7.patch: Add new file. * dist-files.mk: Include new patch.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 14 Apr 2022 19:27:13 +0200
parents fc663bd5f260
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6029
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
1 # HG changeset patch
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
2 # User Philip Nienhuis <prnienhuis@users.sf.net>
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
3 # Date 1641061994 -3600
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
4 # Sat Jan 01 19:33:14 2022 +0100
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
5 # Node ID 5a3553396bea3eeae23c1f22e6bc21e739fded11
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
6 # Parent 4ec046f28e6dbd845c2a49693e7f6a8941157ee6
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
7 fromJSON.m, toJSON.m: improve Java-based BIST (re-apply, bug #60040)
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
8
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
9 diff -r 4ec046f28e6d -r 5a3553396bea inst/fromJSON.m
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
10 --- a/inst/fromJSON.m Thu Dec 30 00:00:41 2021 +0100
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
11 +++ b/inst/fromJSON.m Sat Jan 01 19:33:14 2022 +0100
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
12 @@ -875,12 +875,17 @@
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
13 %! assert(fromJSON('"@@sin"', false), '@@sin');
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
14 %! assert(fromJSON('"@@(x)3*x"', false),'@@(x)3*x');
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
15
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
16 -%!test ## exotic object in structure
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
17 -%! assert( fromJSON('{"a":"[java.math.BigDecimal]"}'),struct('a','[java.math.BigDecimal]'));
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
18 +%# exotic object in structure
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
19 +%!testif HAVE_JAVA
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
20 +%! if (usejava ("jvm"))
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
21 +%! assert(fromJSON('{"a":"[java.math.BigDecimal]"}'),struct('a','[java.math.BigDecimal]'));
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
22 +%! endif
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
23
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
24 -%!test ## exotic object (placeholder of class name)
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
25 -%! assert( fromJSON('"[java.math.BigDecimal]"'),
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
26 -%! '[java.math.BigDecimal]');
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
27 +%# exotic object (placeholder of class name)
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
28 +%!testif HAVE_JAVA
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
29 +%! if (usejava ("jvm"))
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
30 +%! assert(fromJSON('"[java.math.BigDecimal]"'),'[java.math.BigDecimal]');
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
31 +%! endif
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
32
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
33 ############### beautified or confusing JSON BIST #####################
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
34
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
35 diff -r 4ec046f28e6d -r 5a3553396bea inst/toJSON.m
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
36 --- a/inst/toJSON.m Thu Dec 30 00:00:41 2021 +0100
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
37 +++ b/inst/toJSON.m Sat Jan 01 19:33:14 2022 +0100
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
38 @@ -318,9 +318,13 @@
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
39 %!test ## string
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
40 %! assert(toJSON("abcdefg"), '"abcdefg"');
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
41
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
42 -%!test ## unknown class
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
43 -%! obj = javaObject ("java.math.BigDecimal", 1.0);
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
44 +%# unknown class
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
45 +%!testif HAVE_JAVA
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
46 +%! if (usejava ("jvm"))
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
47 +%! obj = javaObject ("java.math.BigDecimal", 1.0);
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
48 %! assert(toJSON(obj), '"[java.math.BigDecimal]"');
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
49 +%! endif
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
50 +
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
51
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
52 %!test ## apparent JSON string, do not quote
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
53 %! assert(toJSON('[]'),'[]');
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
54 @@ -453,9 +457,13 @@
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
55 %! assert(toJSON(@sin),'"@@(x) sin(x)"')
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
56 %! assert(toJSON(@(a,b)a+b+c),'"@@(a, b) a + b + c"')
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
57
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
58 -%!test ## struct with java object
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
59 -%! obj = javaObject ("java.math.BigDecimal", 1.0);
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
60 +%# struct with java object
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
61 +%!testif HAVE_JAVA
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
62 +%! if (usejava ("jvm"))
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
63 +%! obj = javaObject ("java.math.BigDecimal", 1.0);
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
64 %! assert(toJSON(struct('a',obj)), '{"a":"[java.math.BigDecimal]"}');
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
65 +%! endif
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
66 +
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
67
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
68 %!test ## structure array DEFAULT COMPACT
fc663bd5f260 io package: fix for Java-based BIST in JSON functions
Philip Nienhuis <prnienhuis@users.sf.net>
parents:
diff changeset
69 %! s = struct("a",{3.125;3.125});