CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/05/23 23:23:42
Modified files:
. : ChangeLog
lily : parser.yy
scm : lily.scm
Log message:
(bare_int): remove rule. From now on, we require
# before negative integers.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3651&tr2=1.3652&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/parser.yy.diff?tr1=1.468&tr2=1.469&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/lily.scm.diff?tr1=1.343&tr2=1.344&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3651 lilypond/ChangeLog:1.3652
--- lilypond/ChangeLog:1.3651 Mon May 23 22:05:07 2005
+++ lilypond/ChangeLog Mon May 23 23:23:42 2005
@@ -1,3 +1,8 @@
+2005-05-24 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/parser.yy (bare_int): remove rule. From now on, we require
+ # before negative integers.
+
2005-05-23 Graham Percival <[EMAIL PROTECTED]>
* ly/property.ly: Update tieDotted to have the same form as slurDotted.
@@ -18,7 +23,7 @@
* lily/general-scheme.cc (ly:stderr-redirect): Rename from
ly:port-move. Needs to be stderr-specific on mingw.
- Run fixcc.
+ Run fixcc.
2005-05-20 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
Index: lilypond/lily/parser.yy
diff -u lilypond/lily/parser.yy:1.468 lilypond/lily/parser.yy:1.469
--- lilypond/lily/parser.yy:1.468 Tue May 3 12:13:28 2005
+++ lilypond/lily/parser.yy Mon May 23 23:23:42 2005
@@ -424,7 +424,6 @@
%type <book> book_block
%type <book> book_body
-%type <i> bare_int
%type <i> bare_unsigned
%type <i> bass_mod
%type <i> dots
@@ -1520,8 +1519,17 @@
| LYRICS_STRING {
$$ = $1;
}
- | bare_int {
- $$ = scm_int2num ($1);
+ | bare_number {
+ $$ = $1;
+/* if (scm_integer_p ($1) == SCM_BOOL_T)
+ {
+ int k = scm_to_int (scm_inexact_to_exact ($1));
+ $$ = k;
+ } else
+ {
+ THIS->parser_error (@1, _ ("need integer number arg"));
+ $$ = 0;
+ }*/
}
| embedded_scm {
$$ = $1;
@@ -2485,23 +2493,6 @@
}
;
-bare_int:
- bare_number {
- if (scm_integer_p ($1) == SCM_BOOL_T)
- {
- int k = scm_to_int ($1);
- $$ = k;
- } else
- {
- THIS->parser_error (@1, _ ("need integer number arg"));
- $$ = 0;
- }
- }
- | '-' bare_int {
- $$ = -$2;
- }
- ;
-
exclamations:
{ $$ = 0; }
| exclamations '!' { $$ ++; }
Index: lilypond/scm/lily.scm
diff -u lilypond/scm/lily.scm:1.343 lilypond/scm/lily.scm:1.344
--- lilypond/scm/lily.scm:1.343 Mon May 23 22:05:07 2005
+++ lilypond/scm/lily.scm Mon May 23 23:23:42 2005
@@ -417,4 +417,4 @@
(or (not (running-from-gui?))
(ly:get-option 'safe)
(define lilypond-main gui-main))
- (define lilypond-main gui-main)
+; (define lilypond-main gui-main)
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
