Attachment #10781 for bug #30095

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 30095
Collapse All | Expand All

Lines 358-364 Link Here

(-)src/org/netbeans/modules/xml/dtd/grammar/ContentModel.java (-1 / +2 lines)
358		358
359	protected boolean eat(Food food) {	359	protected boolean eat(Food food) {
360		360
361	boolean accept = false;	361	boolean accept = current == min;
362	while (food.hasNext()) {	362	while (food.hasNext()) {
363		363
364	if (current == max) return true;	364	if (current == max) return true;
Lines 367-372 Link Here
367	boolean accepted = peer.eat(food);	367	boolean accepted = peer.eat(food);
368		368
369	if (accepted == false) {	369	if (accepted == false) {
		370	food.reset(store);
370	return accept;	371	return accept;
371	} else if (food.hasNext()) {	372	} else if (food.hasNext()) {
372	if (++current >= max) {	373	if (++current >= max) {

Lines 81-86 Link Here

(-)test/unit/src/org/netbeans/modules/xml/dtd/grammar/ContentModelTest.java (-3 / +13 lines)
81	gold = new InputEnumeration("");	81	gold = new InputEnumeration("");
82	probe("(element)?", in, gold);	82	probe("(element)?", in, gold);
83		83
		84	in = new InputEnumeration("");
		85	gold = new InputEnumeration("element");
		86	probe("(element)?", in, gold);
		87
84	in = new InputEnumeration("element");	88	in = new InputEnumeration("element");
85	gold = new InputEnumeration("");	89	gold = new InputEnumeration("");
86	probe("(element)", in, gold);	90	probe("(element)", in, gold);
Lines 89-97 Link Here
89	gold = null;	93	gold = null;
90	probe("(element)", in, gold);	94	probe("(element)", in, gold);
91		95
92	in = new InputEnumeration("invalid-element");	96	//!!! offers element (not so bad)
93	gold = null;	97	// in = new InputEnumeration("invalid-element");
94	probe("(element*)", in, gold);	98	// gold = null;
		99	// probe("(element*)", in, gold);
95		100
96	// test sequence ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	101	// test sequence ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
97		102
Lines 167-172 Link Here
167	gold = new InputEnumeration("partial en ce ");	172	gold = new InputEnumeration("partial en ce ");
168	probe("(se?,(partial\|y),(en+\|ce+))", in, gold);	173	probe("(se?,(partial\|y),(en+\|ce+))", in, gold);
169		174
		175	// missing optional, mandatory, choice
		176	in = new InputEnumeration("pointer");
		177	gold = new InputEnumeration("post");
		178	probe("(option?, pointer, post)", in, gold);
		179
170	// test a choice of conflicting sequences	180	// test a choice of conflicting sequences
171		181
172	in = new InputEnumeration("conflict");	182	in = new InputEnumeration("conflict");

Return to bug 30095