* 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
@ -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>
|
Fri Jan 24 05:12:55 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
|
||||||
|
|
||||||
* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): deal
|
* 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 tLSHFT tRSHFT
|
||||||
%left '+' '-'
|
%left '+' '-'
|
||||||
%left '*' '/' '%'
|
%left '*' '/' '%'
|
||||||
%right tUMINUS_NUM
|
%right tUMINUS_NUM tUMINUS
|
||||||
%right tPOW
|
%right tPOW
|
||||||
%right '!' '~' tUPLUS tUMINUS
|
%right '!' '~' tUPLUS
|
||||||
|
|
||||||
%token tLAST_TOKEN
|
%token tLAST_TOKEN
|
||||||
|
|
||||||
|
3
regex.c
3
regex.c
@ -1447,8 +1447,7 @@ re_compile_pattern(pattern, size, bufp)
|
|||||||
int size;
|
int size;
|
||||||
unsigned last = (unsigned)-1;
|
unsigned last = (unsigned)-1;
|
||||||
|
|
||||||
if ((size = EXTRACT_UNSIGNED(&b[(1 << BYTEWIDTH) / BYTEWIDTH]))
|
if ((size = EXTRACT_UNSIGNED(&b[(1 << BYTEWIDTH) / BYTEWIDTH])) || current_mbctype) {
|
||||||
|| current_mbctype) {
|
|
||||||
/* Ensure the space is enough to hold another interval
|
/* Ensure the space is enough to hold another interval
|
||||||
of multi-byte chars in charset(_not)?. */
|
of multi-byte chars in charset(_not)?. */
|
||||||
size = (1 << BYTEWIDTH) / BYTEWIDTH + 2 + size*8 + 8;
|
size = (1 << BYTEWIDTH) / BYTEWIDTH + 2 + size*8 + 8;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user