diff options
author | Daniel Veillard <veillard@src.gnome.org> | 2005-08-25 13:19:21 +0000 |
---|---|---|
committer | Daniel Veillard <veillard@src.gnome.org> | 2005-08-25 13:19:21 +0000 |
commit | 8874b94cd2e2086f4cefe026286e0f64cac6ec9a (patch) | |
tree | 640c7e31f9cd75634487bb9074cc74516209aab9 /result | |
parent | 3854c57a99852edc952cd69d4e7330b39031035c (diff) | |
download | android_external_libxml2-8874b94cd2e2086f4cefe026286e0f64cac6ec9a.tar.gz android_external_libxml2-8874b94cd2e2086f4cefe026286e0f64cac6ec9a.tar.bz2 android_external_libxml2-8874b94cd2e2086f4cefe026286e0f64cac6ec9a.zip |
added a parser XML_PARSE_COMPACT option to allocate small text nodes (less
* HTMLparser.c parser.c SAX2.c debugXML.c tree.c valid.c xmlreader.c
xmllint.c include/libxml/HTMLparser.h include/libxml/parser.h:
added a parser XML_PARSE_COMPACT option to allocate small
text nodes (less than 8 bytes on 32bits, less than 16bytes on 64bits)
directly within the node, various changes to cope with this.
* result/XPath/tests/* result/XPath/xptr/* result/xmlid/*: this
slightly change the output
Daniel
Diffstat (limited to 'result')
-rw-r--r-- | result/XPath/tests/chaptersbase | 4 | ||||
-rw-r--r-- | result/XPath/tests/idsimple | 2 | ||||
-rw-r--r-- | result/XPath/tests/langsimple | 16 | ||||
-rw-r--r-- | result/XPath/tests/mixedpat | 32 | ||||
-rw-r--r-- | result/XPath/tests/simpleabbr | 8 | ||||
-rw-r--r-- | result/XPath/tests/simplebase | 4 | ||||
-rw-r--r-- | result/XPath/tests/usr1check | 4 | ||||
-rw-r--r-- | result/XPath/xptr/strrange | 14 | ||||
-rw-r--r-- | result/XPath/xptr/strrange2 | 2 | ||||
-rw-r--r-- | result/xmlid/id_err2.xml | 2 | ||||
-rw-r--r-- | result/xmlid/id_tst1.xml | 2 | ||||
-rw-r--r-- | result/xmlid/id_tst2.xml | 2 | ||||
-rw-r--r-- | result/xmlid/id_tst3.xml | 2 | ||||
-rw-r--r-- | result/xmlid/id_tst4.xml | 2 |
14 files changed, 48 insertions, 48 deletions
diff --git a/result/XPath/tests/chaptersbase b/result/XPath/tests/chaptersbase index 03c65670..10636c30 100644 --- a/result/XPath/tests/chaptersbase +++ b/result/XPath/tests/chaptersbase @@ -72,10 +72,10 @@ Set contains 1 nodes: Expression: /child::EXAMPLE/child::head/node() Object is a Node Set : Set contains 3 nodes: -1 TEXT +1 TEXT compact content= 2 ELEMENT title -3 TEXT +3 TEXT compact content= ======================== diff --git a/result/XPath/tests/idsimple b/result/XPath/tests/idsimple index 891b52e5..76d9286f 100644 --- a/result/XPath/tests/idsimple +++ b/result/XPath/tests/idsimple @@ -5,7 +5,7 @@ Object is a Node Set : Set contains 1 nodes: 1 ELEMENT EXAMPLE ATTRIBUTE id - TEXT + TEXT compact content=root ATTRIBUTE prop1 TEXT diff --git a/result/XPath/tests/langsimple b/result/XPath/tests/langsimple index d8d7afdb..02544625 100644 --- a/result/XPath/tests/langsimple +++ b/result/XPath/tests/langsimple @@ -5,30 +5,30 @@ Object is a Node Set : Set contains 9 nodes: 1 ELEMENT b ATTRIBUTE lang - TEXT + TEXT compact content=en 2 ELEMENT x 3 ELEMENT x 4 ELEMENT para ATTRIBUTE lang - TEXT + TEXT compact content=en 5 ELEMENT div ATTRIBUTE lang - TEXT + TEXT compact content=en 6 ELEMENT para 7 ELEMENT para ATTRIBUTE lang - TEXT + TEXT compact content=EN 8 ELEMENT para ATTRIBUTE lang - TEXT + TEXT compact content=en-us 9 ELEMENT para ATTRIBUTE lang - TEXT + TEXT compact content=EN-US ======================== @@ -37,11 +37,11 @@ Object is a Node Set : Set contains 2 nodes: 1 ELEMENT para ATTRIBUTE lang - TEXT + TEXT compact content=en-us 2 ELEMENT para ATTRIBUTE lang - TEXT + TEXT compact content=EN-US ======================== diff --git a/result/XPath/tests/mixedpat b/result/XPath/tests/mixedpat index 3be0c497..f3d746ac 100644 --- a/result/XPath/tests/mixedpat +++ b/result/XPath/tests/mixedpat @@ -5,7 +5,7 @@ Object is a Node Set : Set contains 1 nodes: 1 ELEMENT s ATTRIBUTE p - TEXT + TEXT compact content=root ======================== @@ -14,11 +14,11 @@ Object is a Node Set : Set contains 2 nodes: 1 ELEMENT s ATTRIBUTE p - TEXT + TEXT compact content=root 2 ELEMENT s ATTRIBUTE p - TEXT + TEXT compact content=p1 ======================== @@ -27,11 +27,11 @@ Object is a Node Set : Set contains 2 nodes: 1 ELEMENT s ATTRIBUTE p - TEXT + TEXT compact content=root 2 ELEMENT s ATTRIBUTE p - TEXT + TEXT compact content=p1 ======================== @@ -40,11 +40,11 @@ Object is a Node Set : Set contains 2 nodes: 1 ELEMENT s ATTRIBUTE p - TEXT + TEXT compact content=root 2 ELEMENT s ATTRIBUTE p - TEXT + TEXT compact content=p1 ======================== @@ -53,15 +53,15 @@ Object is a Node Set : Set contains 3 nodes: 1 ELEMENT s ATTRIBUTE p - TEXT + TEXT compact content=root 2 ELEMENT s ATTRIBUTE p - TEXT + TEXT compact content=p1 3 ELEMENT s ATTRIBUTE p - TEXT + TEXT compact content=p2 ======================== @@ -70,16 +70,16 @@ Object is a Node Set : Set contains 4 nodes: 1 ELEMENT s ATTRIBUTE p - TEXT + TEXT compact content=root 2 ELEMENT p1 3 ELEMENT s ATTRIBUTE p - TEXT + TEXT compact content=p1 4 ELEMENT s ATTRIBUTE p - TEXT + TEXT compact content=p2 ======================== @@ -88,14 +88,14 @@ Object is a Node Set : Set contains 4 nodes: 1 ELEMENT s ATTRIBUTE p - TEXT + TEXT compact content=root 2 ELEMENT p1 3 ELEMENT s ATTRIBUTE p - TEXT + TEXT compact content=p1 4 ELEMENT s ATTRIBUTE p - TEXT + TEXT compact content=p2 diff --git a/result/XPath/tests/simpleabbr b/result/XPath/tests/simpleabbr index 85da41a2..61378127 100644 --- a/result/XPath/tests/simpleabbr +++ b/result/XPath/tests/simpleabbr @@ -45,7 +45,7 @@ Object is a Node Set : Set contains 2 nodes: 1 TEXT content=bla bla bla ... -2 TEXT +2 TEXT compact content=... ======================== @@ -54,7 +54,7 @@ Object is a Node Set : Set contains 2 nodes: 1 TEXT content=bla bla bla ... -2 TEXT +2 TEXT compact content=... ======================== @@ -63,7 +63,7 @@ Object is a Node Set : Set contains 2 nodes: 1 TEXT content=bla bla bla ... -2 TEXT +2 TEXT compact content=... ======================== @@ -77,5 +77,5 @@ Set contains 1 nodes: Expression: (//p/text())[position()=last()] Object is a Node Set : Set contains 1 nodes: -1 TEXT +1 TEXT compact content=... diff --git a/result/XPath/tests/simplebase b/result/XPath/tests/simplebase index 38fa1449..3ba17493 100644 --- a/result/XPath/tests/simplebase +++ b/result/XPath/tests/simplebase @@ -53,10 +53,10 @@ Set contains 1 nodes: Expression: /child::EXAMPLE/child::head/node() Object is a Node Set : Set contains 3 nodes: -1 TEXT +1 TEXT compact content= 2 ELEMENT title -3 TEXT +3 TEXT compact content= ======================== diff --git a/result/XPath/tests/usr1check b/result/XPath/tests/usr1check index 03089916..f284198b 100644 --- a/result/XPath/tests/usr1check +++ b/result/XPath/tests/usr1check @@ -5,8 +5,8 @@ Object is a Node Set : Set contains 1 nodes: 1 ELEMENT ITEM ATTRIBUTE monto - TEXT + TEXT compact content=50.12 ATTRIBUTE divisa - TEXT + TEXT compact content=DOL diff --git a/result/XPath/xptr/strrange b/result/XPath/xptr/strrange index c14ed917..9c0096d5 100644 --- a/result/XPath/xptr/strrange +++ b/result/XPath/xptr/strrange @@ -44,7 +44,7 @@ Expression: xpointer(string-range(//p, 'difficult')) Object is a Location Set: 1 : Object is a range : From index 3 in node - TEXT + TEXT compact content=a diff To index 4 in node TEXT @@ -56,10 +56,10 @@ Expression: xpointer(string-range(//p, 'spanning')) Object is a Location Set: 1 : Object is a range : From index 3 in node - TEXT + TEXT compact content=a span To index 3 in node - TEXT + TEXT compact content=ing one @@ -80,17 +80,17 @@ Expression: xpointer(string-range(//seq, '')) Object is a Location Set: 1 : Object is a collapsed range : index 1 in node - TEXT + TEXT compact content=123 2 : Object is a collapsed range : index 2 in node - TEXT + TEXT compact content=123 3 : Object is a collapsed range : index 3 in node - TEXT + TEXT compact content=123 4 : Object is a collapsed range : index 4 in node - TEXT + TEXT compact content=123 diff --git a/result/XPath/xptr/strrange2 b/result/XPath/xptr/strrange2 index ea6ee45a..fd6c0ea4 100644 --- a/result/XPath/xptr/strrange2 +++ b/result/XPath/xptr/strrange2 @@ -60,5 +60,5 @@ Expression: xpointer(string-range(//p, 'difficult', 1, 0)) Object is a Location Set: 1 : Object is a collapsed range : index 3 in node - TEXT + TEXT compact content=a diff diff --git a/result/xmlid/id_err2.xml b/result/xmlid/id_err2.xml index 33ee896d..c7956dca 100644 --- a/result/xmlid/id_err2.xml +++ b/result/xmlid/id_err2.xml @@ -2,5 +2,5 @@ Object is a Node Set : Set contains 1 nodes: 1 ELEMENT foo ATTRIBUTE id - TEXT + TEXT compact content=bar diff --git a/result/xmlid/id_tst1.xml b/result/xmlid/id_tst1.xml index 33ee896d..c7956dca 100644 --- a/result/xmlid/id_tst1.xml +++ b/result/xmlid/id_tst1.xml @@ -2,5 +2,5 @@ Object is a Node Set : Set contains 1 nodes: 1 ELEMENT foo ATTRIBUTE id - TEXT + TEXT compact content=bar diff --git a/result/xmlid/id_tst2.xml b/result/xmlid/id_tst2.xml index 33ee896d..c7956dca 100644 --- a/result/xmlid/id_tst2.xml +++ b/result/xmlid/id_tst2.xml @@ -2,5 +2,5 @@ Object is a Node Set : Set contains 1 nodes: 1 ELEMENT foo ATTRIBUTE id - TEXT + TEXT compact content=bar diff --git a/result/xmlid/id_tst3.xml b/result/xmlid/id_tst3.xml index e2f82286..bf020eb2 100644 --- a/result/xmlid/id_tst3.xml +++ b/result/xmlid/id_tst3.xml @@ -2,5 +2,5 @@ Object is a Node Set : Set contains 1 nodes: 1 ELEMENT o:o ATTRIBUTE id - TEXT + TEXT compact content=bar diff --git a/result/xmlid/id_tst4.xml b/result/xmlid/id_tst4.xml index 33ee896d..c7956dca 100644 --- a/result/xmlid/id_tst4.xml +++ b/result/xmlid/id_tst4.xml @@ -2,5 +2,5 @@ Object is a Node Set : Set contains 1 nodes: 1 ELEMENT foo ATTRIBUTE id - TEXT + TEXT compact content=bar |