[macruby-changes] [3864] MacRuby/trunk/parse.y
source_changes at macosforge.org
source_changes at macosforge.org
Thu Mar 25 14:48:49 PDT 2010
Revision: 3864
http://trac.macosforge.org/projects/ruby/changeset/3864
Author: lsansonetti at apple.com
Date: 2010-03-25 14:48:47 -0700 (Thu, 25 Mar 2010)
Log Message:
-----------
fixed mixed error
Modified Paths:
--------------
MacRuby/trunk/parse.y
Modified: MacRuby/trunk/parse.y
===================================================================
--- MacRuby/trunk/parse.y 2010-03-25 06:26:21 UTC (rev 3863)
+++ MacRuby/trunk/parse.y 2010-03-25 21:48:47 UTC (rev 3864)
@@ -5670,6 +5670,18 @@
int c;
int has_nonascii = 0;
rb_encoding *enc = *encp;
+
+#if 1
+# define mixed_error(enc1, enc2) yyerror("mixed error")
+# define mixed_escape(beg, enc1, enc2) \
+ do { \
+ const char *pos = lex_p; \
+ lex_p = beg; \
+ mixed_error(enc1, enc2); \
+ lex_p = pos; \
+ } \
+ while (0)
+#else
char *errbuf = 0;
static const char mixed_msg[] = "%s mixed within %s source";
@@ -5689,6 +5701,7 @@
mixed_error(enc1, enc2); \
lex_p = pos; \
} while (0)
+#endif
while ((c = nextc()) != -1) {
if (paren && c == paren) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100325/186a8032/attachment.html>
More information about the macruby-changes
mailing list