fix processor

This commit is contained in:
a-sansara 2018-09-04 18:47:16 +02:00
parent 1ef7559309
commit 36f7cdcc6f
9 changed files with 329 additions and 63 deletions

BIN
lastpluie-yaml-0.5.tar.gz Normal file

Binary file not shown.

View File

@ -49,6 +49,7 @@ configure_file(
install_data([ install_data([
'resources/main.yml', 'resources/main.yml',
'resources/tag.yml', 'resources/tag.yml',
'resources/bug.yml',
'resources/test.yml', 'resources/test.yml',
'resources/test.json' 'resources/test.json'
], ],

82
resources/bug.yml Normal file
View File

@ -0,0 +1,82 @@
%YAML 1.2
%TAG !v! tag:pluie.org,2018:vala/
---
!v!Pluie.Berel.Meta meta :
!v!Gee.ArrayList keys :
- software : berel; <https://git.pluie.org/pluie/berel>
- version : 0.24
- type : program
- date : 2018
- license : GPLv3.0; <http://www.gnu.org/licenses/>
- author : a-Sansara; <[dev]at[pluie]dot[org]>
- copyright : pluie.org; <http://www.pluie.org>
!v!Gee.ArrayList headers :
- !v!Pluie.Berel.HeaderDef sh :
file :
- build.sh
startline : 2 # to embed shebang before header tpl
sepline :
motif : "# "
repeat : 40
comment :
start : "#^#"
end : "#^#"
begin : "# "
- !v!Pluie.Berel.HeaderDef meson :
file :
- meson.build
- src/meson.build
sepline :
motif : "# "
repeat : 40
comment :
start : "#^#"
end : "#^#"
begin : "# "
- !v!Pluie.Berel.HeaderDef vala :
dir :
- src
extension :
- .vala
sepline :
motif : " *"
repeat : 40
comment :
start : "/*^"
end : "^*/"
begin : " * "
tpl : |
^sepline^
^keys^
^sepline^
This file is part of ^software.name^.
^software.name^ is free software (free as in speech) : 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.
^software.name^ 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 ^software.name^. If not, see <http://www.gnu.org/licenses/>.
^sepline^
product:
- sku : BL394D
quantity : 4
description : Basketball
price : 450.00
- sku : BL394D
quantity : 4
description : Basketball
price : 450.00

55
samples/yaml-bug.vala Normal file
View File

@ -0,0 +1,55 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* @software : pluie-yaml <https://git.pluie.org/pluie/lib-yaml>
* @version : 0.5
* @type : library
* @date : 2018
* @licence : GPLv3.0 <http://www.gnu.org/licenses/>
* @author : a-Sansara <[dev]at[pluie]dot[org]>
* @copyright : pluie.org <http://www.pluie.org/>
*
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* This file is part of pluie-yaml.
*
* pluie-yaml is free software (free as in speech) : 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.
*
* pluie-yaml 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 pluie-yaml. If not, see <http://www.gnu.org/licenses/>.
*
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*/
using GLib;
using Gee;
using Pluie;
int main (string[] args)
{
Echo.init(false);
var path = Yaml.DATA_PATH + "/bug.yml";
var done = false;
of.title ("Pluie Yaml Library", Pluie.Yaml.VERSION, "a-sansara");
Pluie.Yaml.DEBUG = false;
var loader = new Yaml.Loader (path, true, true);
if ((done = loader.done)) {
var root = loader.get_nodes ();
done = root != null;
}
of.rs (done);
of.echo ();
return (int) done;
}

View File

@ -41,7 +41,7 @@ int main (string[] args)
var done = false; var done = false;
of.title ("Pluie Yaml Library", Pluie.Yaml.VERSION, "a-sansara"); of.title ("Pluie Yaml Library", Pluie.Yaml.VERSION, "a-sansara");
Pluie.Yaml.DEBUG = false; Pluie.Yaml.DEBUG = true;
Yaml.Object? obj = null; Yaml.Object? obj = null;
var config = new Yaml.Config (path, true); var config = new Yaml.Config (path, true);
var root = config.root_node (); var root = config.root_node ();

View File

@ -36,11 +36,14 @@ using Pluie;
*/ */
public class Pluie.Yaml.Loader public class Pluie.Yaml.Loader
{ {
/**
* Flag PACK_NESTED_ENTRIES
*/
public static bool PACK_NESTED_ENTRIES { public get; public set; default = false; }
/** /**
* Yaml.Scanner used to retriew yaml events * Yaml.Scanner used to retriew yaml events
*/ */
Yaml.Scanner scanner { public get; internal set; } Yaml.Scanner scanner { public get; internal set; }
/** /**
* indicate if file has been sucessfully loaded * indicate if file has been sucessfully loaded
*/ */
@ -84,7 +87,33 @@ public class Pluie.Yaml.Loader
*/ */
public Yaml.Node? get_nodes () public Yaml.Node? get_nodes ()
{ {
return this.scanner.get_nodes (); Yaml.Node? n = this.scanner.get_nodes ();
if (PACK_NESTED_ENTRIES) {
this.pack_entries (n);
}
return n;
}
/**
*
*/
private void pack_entries (Yaml.Node? node = null)
{
bool restart = false;
if (node != null) {
if (node.ntype.is_sequence ()) {
foreach (var child in node) {
if (child.ntype.is_mapping () && child.name[0] == '_' && child.count () == 1) {
var sub = child.first ().clone_node ();
node.replace_node (child, sub);
restart = true;
break;
}
}
if (restart) pack_entries (node);
}
else foreach (var child in node) this.pack_entries (child);
}
} }
/** /**

View File

@ -76,6 +76,8 @@ public class Pluie.Yaml.Node : Yaml.AbstractChild, Pluie.Yaml.Collection
} }
catch (Yaml.AddNodeError e) { catch (Yaml.AddNodeError e) {
of.warn (e.message); of.warn (e.message);
Yaml.dbg (this.to_string ());
this.display_childs ();
} }
return done; return done;
} }
@ -261,6 +263,21 @@ public class Pluie.Yaml.Node : Yaml.AbstractChild, Pluie.Yaml.Collection
return v; return v;
} }
/**
*
*/
public void replace_node (Yaml.Node child, Yaml.Node new_child)
{
int index = this.list.index_of (child);
if (index > -1) {
new_child.level = this.level + 1;
new_child.parent = this;
new_child.update_level ();
this.list.remove_at (index);
this.list.insert (index, new_child);
}
}
/** /**
* display childs * display childs
* @param withTitle display a title before the childs node presentation * @param withTitle display a title before the childs node presentation

View File

@ -46,6 +46,21 @@ public class Pluie.Yaml.Processor
*/ */
bool change; bool change;
/**
* indicates if document start begin
*/
bool begin;
/**
* indicates if new node is a sequence entry
*/
bool isEntry;
/**
* indicates if new node is a sequence entry mapping
*/
bool isEntryMapping;
/** /**
* indicates if begon a flow sequence * indicates if begon a flow sequence
*/ */
@ -174,7 +189,7 @@ public class Pluie.Yaml.Processor
this.reset (); this.reset ();
for (var has_next = this.iterator.next (); has_next; has_next = this.iterator.next ()) { for (var has_next = this.iterator.next (); has_next; has_next = this.iterator.next ()) {
this.event = this.iterator.get (); this.event = this.iterator.get ();
Yaml.dbg (" 0>>>>> [EVENT event [%d] %s <<<<< %s".printf (this.indexEvt++, this.event.evtype.infos (), Log.METHOD)); Yaml.dbg (" [[[ EVENT %d %s ]]]".printf (this.indexEvt++, this.event.evtype.infos ()));
if (this.event.evtype.is_tag_directive ()) { if (this.event.evtype.is_tag_directive ()) {
this.on_tag_directive (); this.on_tag_directive ();
} }
@ -182,29 +197,49 @@ public class Pluie.Yaml.Processor
this.on_error (); this.on_error ();
break; break;
} }
if (!this.begin) {
if (this.event.evtype.is_document_start ()) {
this.begin = true;
// to do
this.next_event ();
continue;
}
}
else {
if (this.event.evtype.is_mapping_end () || this.event.evtype.is_sequence_end ()) { if (this.event.evtype.is_mapping_end () || this.event.evtype.is_sequence_end ()) {
this.on_block_end (); this.on_block_end ();
continue; continue;
} }
if (this.event.evtype.is_entry ()) {
this.on_entry ();
}
if (this.beginFlowSeq && this.event.evtype.is_scalar ()) {
if (!this.change) {
this.on_scalar (true);
}
this.beginFlowSeq = false;
}
if (this.event.evtype.is_key () && (this.event = this.get_value_key_event ()) != null) { if (this.event.evtype.is_key () && (this.event = this.get_value_key_event ()) != null) {
this.on_key (); this.on_key ();
} }
if (this.event.evtype.is_value () && (this.event = this.get_value_event ()) != null) { if (this.event.evtype.is_anchor ()) {
this.on_value (); this.event = this.next_event ();
this.add_anchor_if_needed (); this.on_anchor ();
this.ckey = null;
} }
if (this.event.evtype.is_alias ()) {
this.event = this.next_event ();
this.on_alias ();
}
else if (this.event.evtype.is_entry ()) {
this.on_entry ();
}
else if (this.event.evtype.is_mapping_start ()) {
this.create_mapping (this.isEntry);
}
else if (this.event.evtype.is_sequence_start ()) {
this.on_sequence_start ();
}
else if (this.event.evtype.is_value ()) {
continue;
}
else if (this.event.evtype.is_scalar ()) {
this.on_scalar ();
}
this.add_anchor_if_needed ();
this.on_update (); this.on_update ();
} }
}
this.done = error_event == null && this.root != null; this.done = error_event == null && this.root != null;
return done; return done;
} }
@ -227,6 +262,9 @@ public class Pluie.Yaml.Processor
this.beginFlowSeq = false; this.beginFlowSeq = false;
this.nextValueEvt = null; this.nextValueEvt = null;
this.indexEvt = 0; this.indexEvt = 0;
this.isEntry = false;
this.begin = false;
this.isEntryMapping = false;
} }
/** /**
@ -242,6 +280,19 @@ public class Pluie.Yaml.Processor
return evt; return evt;
} }
/**
* retriew the next Yaml Event without use of iterator
*/
private Yaml.Event? get_next_event ()
{
Yaml.Event? evt = null;
var i = this.indexEvt;
if (i < this.events.size) {
evt = this.events.get (i);
}
return evt;
}
/** /**
* retriew the next Yaml Value Event closest to Key Event * retriew the next Yaml Value Event closest to Key Event
*/ */
@ -275,13 +326,15 @@ public class Pluie.Yaml.Processor
private Yaml.Event? get_next_value_event () private Yaml.Event? get_next_value_event ()
{ {
Yaml.Event? evt = null; Yaml.Event? evt = null;
var i = this.indexEvt+1; var i = this.indexEvt;
Yaml.dbg (" >>> %s from %d".printf (Log.METHOD, i));
var search = true; var search = true;
while (search) { while (search) {
if (i < this.events.size) { if (i < this.events.size) {
var e = this.events.get (i++); var e = this.events.get (i++);
if (e != null && e.evtype.is_value ()) { if (e != null && e.evtype.is_value ()) {
evt = this.events.get (i); evt = this.events.get (i);
Yaml.dbg (" >>> %s > %d : %s".printf (Log.METHOD, i, evt.evtype.infos ()));
break; break;
} }
} }
@ -321,17 +374,19 @@ public class Pluie.Yaml.Processor
*/ */
private void on_block_end () private void on_block_end ()
{ {
Yaml.dbg (" ===== ON BLOCK END ===== "); Yaml.dbg (" ===== >> ON BLOCK END ===== ");
Yaml.dbg (" - parent_node : %s (%s)".printf (this.parent_node.name, this.parent_node.ntype.infos ())); Yaml.dbg (" - parent_node : %s (%s)".printf (this.parent_node.name, this.parent_node.ntype.infos ()));
Yaml.dbg (" - prev_node : %s (%s - collection ? %s)".printf (this.prev_node.name, this.prev_node.ntype.infos (), this.prev_node.ntype.is_collection ().to_string ())); Yaml.dbg (" - prev_node : %s (%s - collection ? %s)".printf (this.prev_node.name, this.prev_node.ntype.infos (), this.prev_node.ntype.is_collection ().to_string ()));
bool suite = true; bool suite = true;
if (this.prev_node.ntype.is_mapping () && this.prev_node.parent != null && this.prev_node.parent.ntype.is_sequence ()) { if (this.prev_node.ntype.is_mapping () && this.prev_node.parent != null && this.prev_node.parent.ntype.is_sequence ()) {
if (!(this.prev_node.parent as Yaml.Sequence).close_block) { if (!(this.prev_node.parent as Yaml.Sequence).close_block) {
(this.prev_node.parent as Yaml.Sequence).close_block = true; (this.prev_node.parent as Yaml.Sequence).close_block = true;
suite = false; Yaml.dbg (" SET FALSE SUITE");
//~ suite = false;
} }
} }
if (suite) { if (suite) {
Yaml.dbg (" SUITE");
if (this.prev_node.ntype.is_scalar () || (this.prev_node.ntype.is_single_pair () && this.prev_node.parent != null && this.prev_node.parent.ntype.is_mapping ())) { if (this.prev_node.ntype.is_scalar () || (this.prev_node.ntype.is_single_pair () && this.prev_node.parent != null && this.prev_node.parent.ntype.is_mapping ())) {
this.prev_node = this.prev_node.parent; this.prev_node = this.prev_node.parent;
} }
@ -340,6 +395,10 @@ public class Pluie.Yaml.Processor
: this.root; : this.root;
this.prev_node = this.parent_node; this.prev_node = this.parent_node;
} }
Yaml.dbg (" - parent_node : %s (%s)".printf (this.parent_node.name, this.parent_node.ntype.infos ()));
Yaml.dbg (" - prev_node : %s (%s - collection ? %s)".printf (this.prev_node.name, this.prev_node.ntype.infos (), this.prev_node.ntype.is_collection ().to_string ()));
Yaml.dbg (this.prev_node.to_string ());
Yaml.dbg (" ===== << ON BLOCK END ====================== ");
} }
/** /**
@ -347,15 +406,13 @@ public class Pluie.Yaml.Processor
*/ */
private void on_entry () private void on_entry ()
{ {
this.event = this.next_event(); this.isEntry = true;
Yaml.Event? e = null; this.ckey = null;
// look up for sequence enrty nested block var e = this.get_next_event ();
e = get_next_value_event (); if (e!= null && e.evtype.is_mapping_start ()) {
if (this.event.evtype.is_mapping_start () && (e!= null && !e.evtype.is_mapping_start () && !e.evtype.is_scalar ())) { this.isEntryMapping = true;
this.on_mapping_start (!e.evtype.is_scalar ()); this.create_mapping (true);
} this.next_event ();
else if (this.event.evtype.is_scalar ()) {
this.on_scalar (true);
} }
} }
@ -387,7 +444,10 @@ public class Pluie.Yaml.Processor
private void on_key () private void on_key ()
{ {
this.on_tag (true); this.on_tag (true);
if (this.event.evtype.is_scalar ()) {
this.ckey = this.event.data["data"]; this.ckey = this.event.data["data"];
Yaml.dbg (" >> node name : %s".printf (this.ckey));
}
} }
/** /**
@ -395,22 +455,21 @@ public class Pluie.Yaml.Processor
*/ */
private void on_value () private void on_value ()
{ {
var e = this.get_next_event();
if (e.evtype.is_scalar ()) {
this.event = this.next_event ();
this.on_tag (false); this.on_tag (false);
if (this.event.evtype.is_scalar ()) { this.node = new Yaml.Scalar (this.parent_node, this.event.data["data"]);
this.on_scalar (); this.change = true;
} }
else if (this.event.evtype.is_anchor ()) { else if (e.evtype.is_anchor ()) {
this.event = this.next_event ();
this.on_anchor (); this.on_anchor ();
} }
else if (this.event.evtype.is_alias ()) { else if (e.evtype.is_alias ()) {
this.event = this.next_event ();
this.on_alias (); this.on_alias ();
} }
if (this.event.evtype.is_mapping_start ()) {
this.on_mapping_start ();
}
else if (this.event.evtype.is_sequence_start ()) {
this.on_sequence_start ();
}
} }
/** /**
@ -418,16 +477,13 @@ public class Pluie.Yaml.Processor
*/ */
private void on_scalar (bool entry = false) private void on_scalar (bool entry = false)
{ {
if (!entry) { if (this.ckey != null && this.parent_node.ntype.is_mapping ()) {
if (this.ckey != null) {
this.node = new Yaml.Mapping.with_scalar (this.parent_node, this.ckey, this.event.data["data"]); this.node = new Yaml.Mapping.with_scalar (this.parent_node, this.ckey, this.event.data["data"]);
this.change = true;
}
} }
else { else {
this.node = new Yaml.Scalar (this.parent_node, this.event.data["data"]); this.node = new Yaml.Scalar (this.parent_node, this.event.data["data"]);
this.change = true;
} }
this.change = true;
} }
/** /**
@ -436,7 +492,6 @@ public class Pluie.Yaml.Processor
private void on_anchor () private void on_anchor ()
{ {
this.idAnchor = this.event.data["id"]; this.idAnchor = this.event.data["id"];
this.event = this.next_event ();
} }
/** /**
@ -460,7 +515,7 @@ public class Pluie.Yaml.Processor
{ {
this.node = new Yaml.Sequence (this.parent_node, this.ckey); this.node = new Yaml.Sequence (this.parent_node, this.ckey);
this.change = true; this.change = true;
this.beginFlowSeq = true; //~ this.beginFlowSeq = true;
} }
/** /**
@ -468,11 +523,26 @@ public class Pluie.Yaml.Processor
*/ */
private void on_mapping_start (bool entry = false) private void on_mapping_start (bool entry = false)
{ {
if (entry) {
this.create_mapping (entry);
this.ckey = null; this.ckey = null;
this.event = this.next_event ();
if (this.event.evtype.is_key ()) {
this.event = this.next_event ();
this.on_tag (true);
if (this.event.evtype.is_scalar ()) {
this.ckey = this.event.data["data"];
Yaml.dbg (" >> node name : %s".printf (this.ckey));
}
var e = this.get_next_value_event();
//~ Yaml.dbg (e.evtype.infos ());
if (e!=null) {
if ( e.evtype.is_sequence_start ()) {
this.on_sequence_start ();
}
else {
this.create_mapping (this.isEntry);
}
}
} }
else this.create_mapping ();
} }
/** /**
@ -480,7 +550,7 @@ public class Pluie.Yaml.Processor
*/ */
private void create_mapping (bool entry = false) private void create_mapping (bool entry = false)
{ {
if (entry) { if (entry && this.ckey == null) {
this.ckey = "_%d".printf(this.parent_node.count()); this.ckey = "_%d".printf(this.parent_node.count());
} }
this.node = new Yaml.Mapping (this.parent_node, this.ckey); this.node = new Yaml.Mapping (this.parent_node, this.ckey);
@ -506,7 +576,9 @@ public class Pluie.Yaml.Processor
private void on_update () private void on_update ()
{ {
if (this.node != null) { if (this.node != null) {
Yaml.dbg (Log.METHOD);
Yaml.dbg (this.node.name); Yaml.dbg (this.node.name);
Yaml.dbg (this.node.ntype.infos ());
} }
if (this.change) { if (this.change) {
if (this.node.parent.ntype.is_sequence ()) { if (this.node.parent.ntype.is_sequence ()) {
@ -537,7 +609,9 @@ public class Pluie.Yaml.Processor
this.keyTag = null; this.keyTag = null;
this.valueTag = null; this.valueTag = null;
this.node = null; this.node = null;
this.isEntryMapping = false;
this.change = false; this.change = false;
this.isEntry = false;
} }
} }

View File

@ -319,6 +319,14 @@ namespace Pluie.Yaml
return this == EVT.NONE; return this == EVT.NONE;
} }
/**
* @return event is document start event
*/
public bool is_document_start ()
{
return this == EVT.DOCUMENT_START;
}
} }
/** /**