From: hanwen Date: Mon, 23 May 2005 23:23:42 +0000 (+0000) Subject: (bare_int): remove rule. From now on, we require X-Git-Tag: release/2.5.32^2~154 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e59034fc4effb13c044c7364ece340b39f1b0f8e;p=lilypond.git (bare_int): remove rule. From now on, we require # before negative integers. --- diff --git a/ChangeLog b/ChangeLog index 546fb47f0b..19395bd16b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-05-24 Han-Wen Nienhuys + + * lily/parser.yy (bare_int): remove rule. From now on, we require + # before negative integers. + 2005-05-23 Graham Percival * 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 diff --git a/lily/parser.yy b/lily/parser.yy index b771f9bb4b..8cf6b01a40 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -424,7 +424,6 @@ parser.yy:352.8-24: warning: symbol `"\\<"' used more than once as a literal str %type book_block %type book_body -%type bare_int %type bare_unsigned %type bass_mod %type dots @@ -1520,8 +1519,17 @@ scalar: string { | 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_unsigned: } ; -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 '!' { $$ ++; } diff --git a/scm/lily.scm b/scm/lily.scm index 1580fe886e..a8dfba06db 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -417,4 +417,4 @@ The syntax is the same as `define*-public'." (or (not (running-from-gui?)) (ly:get-option 'safe) (define lilypond-main gui-main)) - (define lilypond-main gui-main) +; (define lilypond-main gui-main)