summaryrefslogtreecommitdiffhomepage
path: root/src/parse.y
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-07-26 10:52:25 -0700
committerYukihiro "Matz" Matsumoto <[email protected]>2013-07-26 10:52:25 -0700
commitf6d686eae0fce7d93426e0eb188cdc9658dfee75 (patch)
treea347da0b5768c3d767b769d6722e2b4a3099634b /src/parse.y
parent2d83e4b8a4bfd5aa285113fffc50f5b5f639e391 (diff)
parent54ff02acb48f6053fa041737e96b9a064d4b26dc (diff)
downloadmruby-f6d686eae0fce7d93426e0eb188cdc9658dfee75.tar.gz
mruby-f6d686eae0fce7d93426e0eb188cdc9658dfee75.zip
Merge pull request #1410 from Fleurer/introduce-mrb-assert
add assert check for TravisCI
Diffstat (limited to 'src/parse.y')
-rw-r--r--src/parse.y22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/parse.y b/src/parse.y
index fda66e92c..9a83d5cbd 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -1,6 +1,6 @@
/*
** parse.y - mruby parser
-**
+**
** See Copyright Notice in mruby.h
*/
@@ -272,7 +272,7 @@ new_scope(parser_state *p, node *body)
static node*
new_begin(parser_state *p, node *body)
{
- if (body)
+ if (body)
return list2((node*)NODE_BEGIN, body);
return cons((node*)NODE_BEGIN, 0);
}
@@ -909,7 +909,7 @@ parsing_heredoc_inf(parser_state *p)
node *nd = p->parsing_heredoc;
if (nd == NULL)
return NULL;
- /* assert(nd->car->car == NODE_HEREDOC); */
+ /* mrb_assert(nd->car->car == NODE_HEREDOC); */
return (parser_heredoc_info*)nd->car->cdr;
}
@@ -2744,7 +2744,7 @@ var_ref : variable
{
$$ = var_reference(p, $1);
}
- | keyword_nil
+ | keyword_nil
{
$$ = new_nil(p);
}
@@ -3408,7 +3408,7 @@ scan_oct(const int *start, int len, int *retlen)
const int *s = start;
int retval = 0;
- /* assert(len <= 3) */
+ /* mrb_assert(len <= 3) */
while (len-- && *s >= '0' && *s <= '7') {
retval <<= 3;
retval |= *s++ - '0';
@@ -3426,7 +3426,7 @@ scan_hex(const int *start, int len, int *retlen)
register int retval = 0;
char *tmp;
- /* assert(len <= 2) */
+ /* mrb_assert(len <= 2) */
while (len-- && *s && (tmp = (char*)strchr(hexdigit, *s))) {
retval <<= 4;
retval |= (tmp - hexdigit) & 15;
@@ -3686,7 +3686,7 @@ parse_string(parser_state *p)
tokadd(p, c);
- }
+ }
tokfix(p);
p->lstate = EXPR_END;
@@ -3731,7 +3731,7 @@ parse_string(parser_state *p)
yylval.nd = new_str(p, tok(p), toklen(p));
return tSTRING;
}
-
+
static int
heredoc_identifier(parser_state *p)
@@ -4813,7 +4813,7 @@ parser_yylex(parser_state *p)
pushback(p, c);
if (last_state == EXPR_FNAME) goto gvar;
tokfix(p);
- yylval.nd = new_nth_ref(p, atoi(tok(p)));
+ yylval.nd = new_nth_ref(p, atoi(tok(p)));
return tNTH_REF;
default:
@@ -5176,7 +5176,7 @@ parser_state*
mrb_parse_file(mrb_state *mrb, FILE *f, mrbc_context *c)
{
parser_state *p;
-
+
p = mrb_parser_new(mrb);
if (!p) return 0;
p->s = p->send = NULL;
@@ -5561,7 +5561,7 @@ parser_dump(mrb_state *mrb, node *tree, int offset)
printf("NODE_CALL:\n");
parser_dump(mrb, tree->car, offset+1);
dump_prefix(offset+1);
- printf("method='%s' (%d)\n",
+ printf("method='%s' (%d)\n",
mrb_sym2name(mrb, sym(tree->cdr->car)),
(int)(intptr_t)tree->cdr->car);
tree = tree->cdr->cdr->car;