mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* parse.y: tMINUS should have lower precedence than tPOW.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3405 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
69a7d012c4
commit
d35979cdfe
3 changed files with 8 additions and 5 deletions
|
@ -1,3 +1,7 @@
|
|||
Fri Jan 24 18:15:33 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* parse.y: tMINUS should have lower precedence than tPOW.
|
||||
|
||||
Fri Jan 24 05:12:55 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
|
||||
|
||||
* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): deal
|
||||
|
|
4
parse.y
4
parse.y
|
@ -307,9 +307,9 @@ static void top_local_setup();
|
|||
%left tLSHFT tRSHFT
|
||||
%left '+' '-'
|
||||
%left '*' '/' '%'
|
||||
%right tUMINUS_NUM
|
||||
%right tUMINUS_NUM tUMINUS
|
||||
%right tPOW
|
||||
%right '!' '~' tUPLUS tUMINUS
|
||||
%right '!' '~' tUPLUS
|
||||
|
||||
%token tLAST_TOKEN
|
||||
|
||||
|
|
5
regex.c
5
regex.c
|
@ -1447,8 +1447,7 @@ re_compile_pattern(pattern, size, bufp)
|
|||
int size;
|
||||
unsigned last = (unsigned)-1;
|
||||
|
||||
if ((size = EXTRACT_UNSIGNED(&b[(1 << BYTEWIDTH) / BYTEWIDTH]))
|
||||
|| current_mbctype) {
|
||||
if ((size = EXTRACT_UNSIGNED(&b[(1 << BYTEWIDTH) / BYTEWIDTH])) || current_mbctype) {
|
||||
/* Ensure the space is enough to hold another interval
|
||||
of multi-byte chars in charset(_not)?. */
|
||||
size = (1 << BYTEWIDTH) / BYTEWIDTH + 2 + size*8 + 8;
|
||||
|
@ -1687,7 +1686,7 @@ re_compile_pattern(pattern, size, bufp)
|
|||
}
|
||||
else if (had_mbchar == 0 && (!current_mbctype || !had_num_literal)) {
|
||||
SET_LIST_BIT(c);
|
||||
had_num_literal = 0;
|
||||
had_num_literal = 0;
|
||||
}
|
||||
else
|
||||
set_list_bits(c, c, b);
|
||||
|
|
Loading…
Add table
Reference in a new issue