From 0b0746f7f9bd273db83a62152e6c46482b1e342c Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 22 Jun 2004 17:46:01 +0000 Subject: [PATCH] (My_lily_parser): only copy lexer if it exists --- lily/my-lily-parser.cc | 1 - scm/ly-from-scheme.scm | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index 44c8581719..7032ed78ba 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -337,7 +337,6 @@ LY_DEFINE (ly_parser_define, "ly:parser-define", SCM_ASSERT_TYPE (ly_c_symbol_p (symbol), symbol, SCM_ARG2, __FUNCTION__, "symbol"); SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG2, __FUNCTION__, "parser"); - parser->lexer_->set_identifier (scm_symbol_to_string (symbol), val); return SCM_UNSPECIFIED; } diff --git a/scm/ly-from-scheme.scm b/scm/ly-from-scheme.scm index f7928db4b3..43e6269c6e 100644 --- a/scm/ly-from-scheme.scm +++ b/scm/ly-from-scheme.scm @@ -46,7 +46,8 @@ character." (cond (;; $variable (and (symbol? form) (string=? (substring (symbol->string form) 0 1) "$") - (not (string=? (substring (symbol->string form) 1 2) "$"))) + (not (and (<= 2 (string-length (symbol->string form))) + (string=? (substring (symbol->string form) 1 2) "$")))) (create-binding! (string->symbol (substring (symbol->string form) 1)))) (;; atom (not (pair? form)) form) -- 2.39.2