Merge pull request #41 from dmajda/fix-negative-number-comments

Do not lose comments before negative numbers in YCP parser
yast · Aug 7, 2013 · 0dda969 · 0dda969
2 parents bdc1f20 + 447abfc
commit 0dda969
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.0.0
+3.0.1
diff --git a/libycp/src/parser.yy b/libycp/src/parser.yy
@@ -1101,12 +1101,14 @@ infix_expression:
 			$$.c = new YConst (YCode::ycInteger, YCPInteger (-(c->value()->asInteger()->value())));
 			$$.t = Type::Integer;
 			$$.l = $1.l;
+			RULE_COMMENT($1);
 		    }
 		    else if ($2.c->kind() == YCode::ycFloat)
 		    {
 			$$.c = new YConst (YCode::ycFloat, YCPFloat (-(c->value()->asFloat()->value())));
 			$$.t = Type::Float;
 			$$.l = $1.l;
+			RULE_COMMENT($1);
 		    }
 		    else
 		    {

diff --git a/package/yast2-core.changes b/package/yast2-core.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Aug  7 07:46:14 UTC 2013 - dmajda@suse.cz
+
+- Do not lose comments before negative numbers in YCP parser
+  (gh#yast/ycp-killer#617).
+- 3.0.1
+
 -------------------------------------------------------------------
 Tue Jul 30 08:28:27 UTC 2013 - yast-devel@opensuse.org