← Back to branch summary

~ubuntu-branches/ubuntu/hardy/ruby1.8/hardy-updates

« back to all changes in this revision

Viewing changes to debian/patches/144_parse.y.patch

  • Committer: Bazaar Package Importer
  • Author(s): akira yamada
  • Date: 2007-03-13 22:11:58 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20070313221158-h3oql37brlaf2go2
Tags: 1.8.6-1
http://bugs.debian.org/410018
* new upstream version, 1.8.6.
* libruby1.8 conflicts with libopenssl-ruby1.8 (< 1.8.6) (closes: #410018)
* changed packaging style to cdbs from dbs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/144_parse.y.patch
1
 
--- ruby-1.8.5/parse.y  14 Oct 2006 14:33:53 -0000      1.307.2.44
2
 
+++ ruby-1.8.5/parse.y  17 Oct 2006 15:56:28 -0000      1.307.2.46
3
 
@@ -2377,13 +2377,8 @@
4
 
 
5
 
 singleton      : var_ref
6
 
                    {
7
 
-                       if ($1 && nd_type($1) == NODE_SELF) {
8
 
-                           $$ = NEW_SELF();
9
 
-                       }
10
 
-                       else {
11
 
-                           $$ = $1;
12
 
-                           value_expr($$);
13
 
-                       }
14
 
+                       $$ = $1;
15
 
+                       value_expr($$);
16
 
                    }
17
 
                | '(' {lex_state = EXPR_BEG;} expr opt_nl ')'
18
 
                    {
19
 
@@ -4198,13 +4193,13 @@
20
 
                return tSTRING_BEG;
21
 
 
22
 
              case 'W':
23
 
-               lex_strterm = NEW_STRTERM(str_dquote | STR_FUNC_QWORDS, term, paren);
24
 
+               lex_strterm = NEW_STRTERM(str_dword, term, paren);
25
 
                do {c = nextc();} while (ISSPACE(c));
26
 
                pushback(c);
27
 
                return tWORDS_BEG;
28
 
 
29
 
              case 'w':
30
 
-               lex_strterm = NEW_STRTERM(str_squote | STR_FUNC_QWORDS, term, paren);
31
 
+               lex_strterm = NEW_STRTERM(str_sword, term, paren);
32
 
                do {c = nextc();} while (ISSPACE(c));
33
 
                pushback(c);
34
 
                return tQWORDS_BEG;