[xruby commit] r2322 - in trunk/src/com/xruby/compiler: codedom codegen parser

2 views

Skip to first unread message

codesite...@google.com

unread,

Apr 24, 2008, 4:04:06 PM4/24/08

to xruby-...@googlegroups.com

Author: xue.yong.zhi
Date: Thu Apr 24 13:02:45 2008
New Revision: 2322

Added:
trunk/src/com/xruby/compiler/codedom/ClassDefinitionExpression.java
- copied, changed from r2321, /trunk/src/com/xruby/compiler/codedom/ClassDefinationExpression.java
trunk/src/com/xruby/compiler/codedom/ClassDefinitionExpressionTest.java
- copied, changed from r2321, /trunk/src/com/xruby/compiler/codedom/ClassDefinationExpressionTest.java
trunk/src/com/xruby/compiler/codedom/MethodDefinitionExpression.java
- copied, changed from r2321, /trunk/src/com/xruby/compiler/codedom/MethodDefinationExpression.java
trunk/src/com/xruby/compiler/codedom/MethodDefinitionExpressionTest.java
- copied, changed from r2321, /trunk/src/com/xruby/compiler/codedom/MethodDefinationExpressionTest.java
trunk/src/com/xruby/compiler/codedom/ModuleDefinitionExpression.java
- copied, changed from r2321, /trunk/src/com/xruby/compiler/codedom/ModuleDefinationExpression.java
Removed:
trunk/src/com/xruby/compiler/codedom/ClassDefinationExpression.java
trunk/src/com/xruby/compiler/codedom/ClassDefinationExpressionTest.java
trunk/src/com/xruby/compiler/codedom/MethodDefinationExpression.java
trunk/src/com/xruby/compiler/codedom/MethodDefinationExpressionTest.java
trunk/src/com/xruby/compiler/codedom/ModuleDefinationExpression.java
Modified:
trunk/src/com/xruby/compiler/codedom/CodePrinter.java
trunk/src/com/xruby/compiler/codedom/CodeVisitor.java
trunk/src/com/xruby/compiler/codegen/RubyCompilerImpl.java
trunk/src/com/xruby/compiler/parser/RubyParserTest.java
trunk/src/com/xruby/compiler/parser/ruby.g
trunk/src/com/xruby/compiler/parser/ruby.tree.g

Log:
misspell (thanks FX)

Copied:
trunk/src/com/xruby/compiler/codedom/ClassDefinitionExpression.java
(from r2321, /trunk/src/com/xruby/compiler/codedom/ClassDefinationExpression.java)
==============================================================================
---
/trunk/src/com/xruby/compiler/codedom/ClassDefinationExpression.java (original)
+++ trunk/src/com/xruby/compiler/codedom/ClassDefinitionExpression.java
Thu Apr 24 13:02:45 2008
@@ -5,14 +5,14 @@

package com.xruby.compiler.codedom;

-public class ClassDefinationExpression extends Expression {
+public class ClassDefinitionExpression extends Expression {
private Expression scope_exp_;//e.g. class A::B
private String className_;
private Expression exp_;//e.g. class << self
private Expression superClass_;
private BodyStatement bodyStatement_;

- public ClassDefinationExpression(Expression scope, String className,
Expression superClass, BodyStatement bodyStatement) {
+ public ClassDefinitionExpression(Expression scope, String className,
Expression superClass, BodyStatement bodyStatement) {
scope_exp_ = scope;
className_ = className;
exp_ = null;
@@ -20,7 +20,7 @@
bodyStatement_ = bodyStatement;
}

- public ClassDefinationExpression(Expression exp, Expression
superClass, BodyStatement bodyStatement) {
+ public ClassDefinitionExpression(Expression exp, Expression
superClass, BodyStatement bodyStatement) {
scope_exp_ = null;
className_ = null;
exp_ = exp;
@@ -33,23 +33,23 @@
if (null != scope_exp_) {
scope_exp_.accept(visitor);
}
- visitor.visitClassDefination1(className_, null != scope_exp_);
+ visitor.visitClassDefinition1(className_, null != scope_exp_);
if (null != superClass_) {
superClass_.accept(visitor);
} else {
visitor.visitNoSuperClass();
}
- visitor.visitClassDefination2(className_, null != scope_exp_);
+ visitor.visitClassDefinition2(className_, null != scope_exp_);
} else {
exp_.accept(visitor);
- visitor.visitSingletonClassDefination();
+ visitor.visitSingletonClassDefinition();
}

if (null != bodyStatement_) {
bodyStatement_.accept(visitor);
}

- visitor.visitClassDefinationEnd((null == bodyStatement_) ? false : bodyStatement_.lastStatementHasReturnValue());
+ visitor.visitClassDefinitionEnd((null == bodyStatement_) ? false : bodyStatement_.lastStatementHasReturnValue());
}

}

Copied:
trunk/src/com/xruby/compiler/codedom/ClassDefinitionExpressionTest.java
(from r2321, /trunk/src/com/xruby/compiler/codedom/ClassDefinationExpressionTest.java)
==============================================================================
---
/trunk/src/com/xruby/compiler/codedom/ClassDefinationExpressionTest.java (original)
+++
trunk/src/com/xruby/compiler/codedom/ClassDefinitionExpressionTest.java
Thu Apr 24 13:02:45 2008
@@ -5,7 +5,7 @@

package com.xruby.compiler.codedom;

-public class ClassDefinationExpressionTest extends TestingAstTestCase {
+public class ClassDefinitionExpressionTest extends TestingAstTestCase {
public void test_class_defination() {
String program_text =
"class C\n" +
@@ -17,7 +17,7 @@

String expected_result =
"class C\n" +
- "ClassDefination2\n" +
+ "ClassDefinition2\n" +
"def f:0:false:0:false\n" +
"self\n" +
"~~~~\n" +
@@ -40,7 +40,7 @@
String expected_result =
"class C\n" +
"Integer\n" +
- "ClassDefination2\n" +
+ "ClassDefinition2\n" +
"end:false\n" +
"EOF";
assertAstOutput(program_text, expected_result);

Modified: trunk/src/com/xruby/compiler/codedom/CodePrinter.java
==============================================================================
--- trunk/src/com/xruby/compiler/codedom/CodePrinter.java (original)
+++ trunk/src/com/xruby/compiler/codedom/CodePrinter.java Thu Apr 24
13:02:45 2008
@@ -229,7 +229,7 @@
result_.append("\n");
}

- public String visitMethodDefination(String methodName, int
num_of_args, boolean has_asterisk_parameter, int num_of_default_args,
boolean is_singleton_method) {
+ public String visitMethodDefinition(String methodName, int
num_of_args, boolean has_asterisk_parameter, int num_of_default_args,
boolean is_singleton_method) {
result_.append("def ");
result_.append(methodName);
result_.append(":");
@@ -245,39 +245,39 @@
return methodName;
}

- public void visitClassDefination1(String className, boolean
has_scope) {
+ public void visitClassDefinition1(String className, boolean
has_scope) {
result_.append("class ");
result_.append(className);
result_.append("\n");
}

- public void visitClassDefination2(String className, boolean
has_scope) {
- result_.append("ClassDefination2\n");
+ public void visitClassDefinition2(String className, boolean
has_scope) {
+ result_.append("ClassDefinition2\n");
}

- public void visitSingletonClassDefination() {
- result_.append("visitSingletonClassDefination\n");
+ public void visitSingletonClassDefinition() {
+ result_.append("visitSingletonClassDefinition\n");
}

- public void visitModuleDefination(String moduleName, boolean
has_scope) {
+ public void visitModuleDefinition(String moduleName, boolean
has_scope) {
result_.append("module ");
result_.append(moduleName);
result_.append("\n");
}

- public void visitMethodDefinationEnd(boolean
last_statement_has_return_value) {
+ public void visitMethodDefinitionEnd(boolean
last_statement_has_return_value) {
result_.append("end def:");
result_.append(last_statement_has_return_value);
result_.append("\n");
}

- public void visitClassDefinationEnd(boolean
last_statement_has_return_value) {
+ public void visitClassDefinitionEnd(boolean
last_statement_has_return_value) {
result_.append("end:");
result_.append(last_statement_has_return_value);
result_.append("\n");
}

- public void visitModuleDefinationEnd(boolean
last_statement_has_return_value) {
+ public void visitModuleDefinitionEnd(boolean
last_statement_has_return_value) {
result_.append("end:");
result_.append(last_statement_has_return_value);
result_.append("\n");
@@ -484,35 +484,35 @@
result_.append("`\n");
}

- public void visitMethodDefinationParameter(String name) {
+ public void visitMethodDefinitionParameter(String name) {
result_.append("parameter:");
result_.append(name);
result_.append("\n");
}

- public void visitMethodDefinationAsteriskParameter(String name,
int argc) {
+ public void visitMethodDefinitionAsteriskParameter(String name,
int argc) {
result_.append("*parameter:");
result_.append(name);
result_.append("\n");
}

- public void visitMethodDefinationBlockParameter(String name) {
+ public void visitMethodDefinitionBlockParameter(String name) {
result_.append("&parameter:");
result_.append(name);
result_.append("\n");
}

- public void visitMethodDefinationDefaultParameters(int size) {
+ public void visitMethodDefinitionDefaultParameters(int size) {
}

- public Object visitMethodDefinationDefaultParameterBegin(int
index) {
+ public Object visitMethodDefinitionDefaultParameterBegin(int
index) {
result_.append("DefaultParameterBegin:");
result_.append(index);
result_.append("\n");
return null;
}

- public void visitMethodDefinationDefaultParameterEnd(Object
next_label) {
+ public void visitMethodDefinitionDefaultParameterEnd(Object
next_label) {
result_.append("DefaultParameterEnd\n");
}

Modified: trunk/src/com/xruby/compiler/codedom/CodeVisitor.java
==============================================================================
--- trunk/src/com/xruby/compiler/codedom/CodeVisitor.java (original)
+++ trunk/src/com/xruby/compiler/codedom/CodeVisitor.java Thu Apr 24
13:02:45 2008
@@ -73,23 +73,23 @@
public void visitRegexpExpressionWithExpressionSubstitutionEnd(String option);
public void visitCommandOutputExpressionWithExpressionSubstitutionEnd();

- public String visitMethodDefination(String methodName, int
num_of_args, boolean has_asterisk_parameter, int num_of_default_args,
boolean is_singleton_method);
- public void visitMethodDefinationParameter(String name);
- public void visitMethodDefinationAsteriskParameter(String name, int argc);
- public void visitMethodDefinationBlockParameter(String name);
- public void visitMethodDefinationEnd(boolean last_statement_has_return_value);
+ public String visitMethodDefinition(String methodName, int
num_of_args, boolean has_asterisk_parameter, int num_of_default_args,
boolean is_singleton_method);
+ public void visitMethodDefinitionParameter(String name);
+ public void visitMethodDefinitionAsteriskParameter(String name, int argc);
+ public void visitMethodDefinitionBlockParameter(String name);
+ public void visitMethodDefinitionEnd(boolean last_statement_has_return_value);

- public void visitMethodDefinationDefaultParameters(int size);
- public Object visitMethodDefinationDefaultParameterBegin(int index);
- public void visitMethodDefinationDefaultParameterEnd(Object next_label);
+ public void visitMethodDefinitionDefaultParameters(int size);
+ public Object visitMethodDefinitionDefaultParameterBegin(int index);
+ public void visitMethodDefinitionDefaultParameterEnd(Object next_label);

- public void visitClassDefination1(String className, boolean hasColon2);
- public void visitClassDefination2(String className, boolean hasColon2);
- public void visitSingletonClassDefination();
- public void visitClassDefinationEnd(boolean last_statement_has_return_value);
+ public void visitClassDefinition1(String className, boolean hasColon2);
+ public void visitClassDefinition2(String className, boolean hasColon2);
+ public void visitSingletonClassDefinition();
+ public void visitClassDefinitionEnd(boolean last_statement_has_return_value);

- public void visitModuleDefination(String moduleName, boolean has_scope);
- public void visitModuleDefinationEnd(boolean last_statement_has_return_value);
+ public void visitModuleDefinition(String moduleName, boolean has_scope);
+ public void visitModuleDefinitionEnd(boolean last_statement_has_return_value);

public void visitTerminal();
public void visitEof(boolean last_statement_has_return_value);

Copied:
trunk/src/com/xruby/compiler/codedom/MethodDefinitionExpression.java
(from r2321, /trunk/src/com/xruby/compiler/codedom/MethodDefinationExpression.java)
==============================================================================
---
/trunk/src/com/xruby/compiler/codedom/MethodDefinationExpression.java (original)
+++
trunk/src/com/xruby/compiler/codedom/MethodDefinitionExpression.java
Thu Apr 24 13:02:45 2008
@@ -7,7 +7,7 @@

import java.util.*;

-public class MethodDefinationExpression extends Expression {
+public class MethodDefinitionExpression extends Expression {
private String methodName_;
private Expression method_owner_;
private BodyStatement bodyStatement_ = null;
@@ -16,12 +16,12 @@
private String block_parameter_ = null;
private ArrayList<Expression> default_parameters_ = new ArrayList<Expression>();

- public MethodDefinationExpression(String methodName) {
+ public MethodDefinitionExpression(String methodName) {
methodName_ = methodName;
method_owner_ = null;
}

- public MethodDefinationExpression(String methodName, Expression
method_owner) {
+ public MethodDefinitionExpression(String methodName, Expression
method_owner) {
methodName_ = methodName;
method_owner_ = method_owner;
}
@@ -55,32 +55,32 @@
method_owner_.accept(visitor);
}

- String uniqueMethodName = visitor.visitMethodDefination(methodName_,
+ String uniqueMethodName = visitor.visitMethodDefinition(methodName_,
parameters_.size(),
(null != asterisk_parameter_),
default_parameters_.size(),
(null != method_owner_));

for (String p : parameters_) {
- visitor.visitMethodDefinationParameter(p);
+ visitor.visitMethodDefinitionParameter(p);
}

if (null != asterisk_parameter_) {
- visitor.visitMethodDefinationAsteriskParameter(asterisk_parameter_, parameters_.size());
+ visitor.visitMethodDefinitionAsteriskParameter(asterisk_parameter_, parameters_.size());
}

if (null != block_parameter_) {
- visitor.visitMethodDefinationBlockParameter(block_parameter_);
+ visitor.visitMethodDefinitionBlockParameter(block_parameter_);
}

int i = parameters_.size() - default_parameters_.size();
if (!default_parameters_.isEmpty()) {
- visitor.visitMethodDefinationDefaultParameters(default_parameters_.size());
+ visitor.visitMethodDefinitionDefaultParameters(default_parameters_.size());

for (Expression e : default_parameters_) {
- Object next_label = visitor.visitMethodDefinationDefaultParameterBegin(i);
+ Object next_label = visitor.visitMethodDefinitionDefaultParameterBegin(i);
e.accept(visitor);
- visitor.visitMethodDefinationDefaultParameterEnd(next_label);
+ visitor.visitMethodDefinitionDefaultParameterEnd(next_label);
++i;
}
}
@@ -89,7 +89,7 @@
bodyStatement_.accept(visitor);
}

- visitor.visitMethodDefinationEnd((null != bodyStatement_) ?
+ visitor.visitMethodDefinitionEnd((null != bodyStatement_) ?
bodyStatement_.lastStatementHasReturnValue() : false);

int firstLine = this.getPosition();

Copied:
trunk/src/com/xruby/compiler/codedom/MethodDefinitionExpressionTest.java
(from r2321, /trunk/src/com/xruby/compiler/codedom/MethodDefinationExpressionTest.java)
==============================================================================
---
/trunk/src/com/xruby/compiler/codedom/MethodDefinationExpressionTest.java (original)
+++
trunk/src/com/xruby/compiler/codedom/MethodDefinitionExpressionTest.java
Thu Apr 24 13:02:45 2008
@@ -5,7 +5,7 @@

package com.xruby.compiler.codedom;

-public class MethodDefinationExpressionTest extends TestingAstTestCase {
+public class MethodDefinitionExpressionTest extends TestingAstTestCase {
public void test() {
String program_text = "def my_methods() end";

Copied:
trunk/src/com/xruby/compiler/codedom/ModuleDefinitionExpression.java
(from r2321, /trunk/src/com/xruby/compiler/codedom/ModuleDefinationExpression.java)
==============================================================================
---
/trunk/src/com/xruby/compiler/codedom/ModuleDefinationExpression.java (original)
+++
trunk/src/com/xruby/compiler/codedom/ModuleDefinitionExpression.java
Thu Apr 24 13:02:45 2008
@@ -5,12 +5,12 @@

package com.xruby.compiler.codedom;

-public class ModuleDefinationExpression extends Expression {
+public class ModuleDefinitionExpression extends Expression {
private Expression scope_;
private String moduleName_;
private BodyStatement bodyStatement_;

- public ModuleDefinationExpression(Expression exp, String
moduleName, BodyStatement bodyStatement) {
+ public ModuleDefinitionExpression(Expression exp, String
moduleName, BodyStatement bodyStatement) {
scope_ = exp;
moduleName_ = moduleName;
bodyStatement_ = bodyStatement;
@@ -21,13 +21,13 @@
scope_.accept(visitor);
}

- visitor.visitModuleDefination(moduleName_, null != scope_);
+ visitor.visitModuleDefinition(moduleName_, null != scope_);

if (null != bodyStatement_) {
bodyStatement_.accept(visitor);
}

- visitor.visitModuleDefinationEnd((null == bodyStatement_) ?
false : bodyStatement_.lastStatementHasReturnValue());
+ visitor.visitModuleDefinitionEnd((null == bodyStatement_) ?
false : bodyStatement_.lastStatementHasReturnValue());
}

}

Modified: trunk/src/com/xruby/compiler/codegen/RubyCompilerImpl.java
==============================================================================
--- trunk/src/com/xruby/compiler/codegen/RubyCompilerImpl.java (original)
+++ trunk/src/com/xruby/compiler/codegen/RubyCompilerImpl.java Thu Apr
24 13:02:45 2008
@@ -100,7 +100,7 @@
return compilation_results_;
}

- public void visitClassDefination1(String className, boolean
has_scope) {
+ public void visitClassDefinition1(String className, boolean
has_scope) {
MethodGenerator mg = cg_.getMethodGenerator();
if (!isInGlobalScope() && !has_scope) {
mg.loadCurrentClass(isInBlock());
@@ -112,7 +112,7 @@
//super class will be pushed next, then visitSuperClass() will
be called
}

- public void visitClassDefination2(String className, boolean
has_scope) {
+ public void visitClassDefinition2(String className, boolean
has_scope) {
//TODO optimizing aceess to builtin class (use them directly)
MethodGenerator mg = cg_.getMethodGenerator();
if (has_scope) {
@@ -148,18 +148,18 @@
switchToNewClassGenerator(new
ClassGeneratorForClassModuleBuilder(uniqueName, script_name_, null, is_singleton));
}

- public void visitSingletonClassDefination() {
+ public void visitSingletonClassDefinition() {
MethodGenerator mg = cg_.getMethodGenerator();
mg.loadCurrentScope(isInClassBuilder(), isInSingletonMethod(),
isInGlobalScope(), isInBlock());
mg.RubyValue_getSingletonClass();
callClassModuleBuilder("SINGLETON", true);
}

- public void visitClassDefinationEnd(boolean
last_statement_has_return_value) {
+ public void visitClassDefinitionEnd(boolean
last_statement_has_return_value) {
switchToPreviousClassGenerator(last_statement_has_return_value);
}

- public void visitModuleDefination(String moduleName, boolean
has_scope) {
+ public void visitModuleDefinition(String moduleName, boolean
has_scope) {
MethodGenerator mg = cg_.getMethodGenerator();
if (!mg.RubyRuntime_getBuiltinModule(moduleName)) {
if (has_scope) {
@@ -176,7 +176,7 @@
callClassModuleBuilder(moduleName, false);
}

- public void visitModuleDefinationEnd(boolean
last_statement_has_return_value) {
+ public void visitModuleDefinitionEnd(boolean
last_statement_has_return_value) {
switchToPreviousClassGenerator(last_statement_has_return_value);
}

@@ -270,7 +270,7 @@
mg.mark(mg.getLabelManager().getCurrentRedo());
}

String uniqueMethodName = NameFactory.createClassName(extra_,
script_name_, methodName);

@@ -296,23 +296,23 @@
return uniqueMethodName;
}

- public void visitMethodDefinationParameter(String name) {
+ public void visitMethodDefinitionParameter(String name) {
cg_.addParameter(name);
}

- public void visitMethodDefinationAsteriskParameter(String name,
int argc) {
+ public void visitMethodDefinitionAsteriskParameter(String name,
int argc) {
cg_.setAsteriskParameter(name, argc);
}

- public void visitMethodDefinationBlockParameter(String name) {
+ public void visitMethodDefinitionBlockParameter(String name) {
cg_.setBlockParameter(name);
}

- public void visitMethodDefinationEnd(boolean
last_statement_has_return_value) {
+ public void visitMethodDefinitionEnd(boolean
last_statement_has_return_value) {
switchToPreviousClassGenerator(last_statement_has_return_value);
}

- public void visitMethodDefinationDefaultParameters(int size) {
+ public void visitMethodDefinitionDefaultParameters(int size) {
assert(size > 0);
//create a empty array if arg is null (avoid null reference)
MethodGenerator mg = cg_.getMethodGenerator();
@@ -324,7 +324,7 @@
mg.mark(label);
}

- public Object visitMethodDefinationDefaultParameterBegin(int
index) {
+ public Object visitMethodDefinitionDefaultParameterBegin(int
index) {
Label next_label = new Label();

MethodGenerator mg = cg_.getMethodGenerator();
@@ -337,7 +337,7 @@
return next_label;
}

- public void visitMethodDefinationDefaultParameterEnd(Object
next_label) {
+ public void visitMethodDefinitionDefaultParameterEnd(Object
next_label) {
MethodGenerator mg = cg_.getMethodGenerator();
mg.RubyArray_add(false);
mg.pop();

Modified: trunk/src/com/xruby/compiler/parser/RubyParserTest.java
==============================================================================
--- trunk/src/com/xruby/compiler/parser/RubyParserTest.java (original)
+++ trunk/src/com/xruby/compiler/parser/RubyParserTest.java Thu Apr 24
13:02:45 2008
@@ -1219,7 +1219,7 @@
parse(program_texts, "untilExpression");
}

- public void test_moduleDefination() {
+ public void test_moduleDefinition() {
String[] program_texts = {
"module Tk::Tcllib \n end",
"module FreeIDE \n module GUI \n end \n end # module FreeRIDE",
@@ -1228,10 +1228,10 @@
"module A 1==2 \n 1+1; end",
};

- parse(program_texts, "moduleDefination");
+ parse(program_texts, "moduleDefinition");
}

- public void test_classDefination() {
+ public void test_classDefinition() {
String[] program_texts = {

@@ -1264,10 +1264,10 @@
"class C < B::A::C\n \t1==2 \n 1+1; end",
};

- parse(program_texts, "classDefination");
+ parse(program_texts, "classDefinition");
}

- public void test_methodDefination() {
+ public void test_methodDefinition() {
String[] program_texts = {

"def tt4 &block\n" +
@@ -1473,7 +1473,7 @@

};

- parse(program_texts, "methodDefination");
+ parse(program_texts, "methodDefinition");
}

public void test_exceptionHandlingExpression() {

Modified: trunk/src/com/xruby/compiler/parser/ruby.g
==============================================================================
--- trunk/src/com/xruby/compiler/parser/ruby.g (original)
+++ trunk/src/com/xruby/compiler/parser/ruby.g Thu Apr 24 13:02:45 2008
@@ -692,9 +692,9 @@
| caseExpression
| forExpression
| exceptionHandlingExpression
- | moduleDefination
- | classDefination
- | methodDefination
+ | moduleDefinition
+ | classDefinition
+ | methodDefinition
;

primaryExpression
@@ -799,7 +799,7 @@
"end"!
;

-moduleDefination
+moduleDefinition
: "module"^ (LINE_BREAK!)?
moduleName (options {greedy=true;}:terminal)? {enterScope();}
(bodyStatement)?
@@ -811,7 +811,7 @@
| (LEADING_COLON2 CONSTANT) (COLON2^ CONSTANT)*
;

-classDefination
+classDefinition
: "class"^ (LINE_BREAK!)?
( className (LESS_THAN expression)?
| LEFT_SHIFT expression
@@ -837,11 +837,11 @@
| (LEADING_COLON2 CONSTANT) (COLON2^ CONSTANT)*
;

-methodDefination
+methodDefinition
: "def"^ {++is_in_method_defination;}
(options{greedy=true;}:LINE_BREAK!)?
methodName {enterScope();}
- methodDefinationArgument
+ methodDefinitionArgument
(bodyStatement)?
"end"! {leaveScope();--is_in_method_defination;}
;
@@ -953,26 +953,26 @@
| "yield"
;

-methodDefinationArgument
+methodDefinitionArgument
: lparen
- (methodDefinationArgumentWithoutParen)?
+ (methodDefinitionArgumentWithoutParen)?
RPAREN! {tellLexerWeHaveFinishedParsingMethodparameters();}
(options {greedy=true;}:terminal)?
- | (methodDefinationArgumentWithoutParen)? terminal
+ | (methodDefinitionArgumentWithoutParen)? terminal
;

-methodDefinationArgumentWithoutParen
+methodDefinitionArgumentWithoutParen
{boolean seen_star_or_band = false;}
- : normalMethodDefinationArgument
- (COMMA! {if (REST_ARG_PREFIX == LA(1) || BLOCK_ARG_PREFIX ==
LA(1)) {seen_star_or_band = true;break;}} normalMethodDefinationArgument)*
- ( {seen_star_or_band}? restMethodDefinationArgument
- |{seen_star_or_band}? blockMethodDefinationArgument
+ : normalMethodDefinitionArgument
+ (COMMA! {if (REST_ARG_PREFIX == LA(1) || BLOCK_ARG_PREFIX ==
LA(1)) {seen_star_or_band = true;break;}} normalMethodDefinitionArgument)*
+ ( {seen_star_or_band}? restMethodDefinitionArgument
+ |{seen_star_or_band}? blockMethodDefinitionArgument
)?
- | restMethodDefinationArgument
- | blockMethodDefinationArgument
+ | restMethodDefinitionArgument
+ | blockMethodDefinitionArgument
;

-normalMethodDefinationArgument
+normalMethodDefinitionArgument
: variable ((ASSIGN|ASSIGN_WITH_NO_LEADING_SPACE) expression)?
;

@@ -981,11 +981,11 @@
| id2:FUNCTION {addVariable(id2);}
;

-restMethodDefinationArgument
- : REST_ARG_PREFIX (variable (COMMA! blockMethodDefinationArgument)?)?
+restMethodDefinitionArgument
+ : REST_ARG_PREFIX (variable (COMMA! blockMethodDefinitionArgument)?)?
;

-blockMethodDefinationArgument
+blockMethodDefinitionArgument
: BLOCK_ARG_PREFIX variable
;

Modified: trunk/src/com/xruby/compiler/parser/ruby.tree.g
==============================================================================
--- trunk/src/com/xruby/compiler/parser/ruby.tree.g (original)
+++ trunk/src/com/xruby/compiler/parser/ruby.tree.g Thu Apr 24 13:02:45 2008
@@ -268,9 +268,9 @@
}
}
| e=primaryExpression
- | e=methodDefination
- | e=moduleDefination
- | e=classDefination
+ | e=methodDefinition
+ | e=moduleDefinition
+ | e=classDefinition
| e=ifExpression
| e=whileExpression
| e=forInExpression
@@ -637,8 +637,8 @@
}
;

-classDefination
-returns [ClassDefinationExpression e]
+classDefinition
+returns [ClassDefinitionExpression e]
{
Expression scope = null;
String name = null;
@@ -656,15 +656,15 @@
)
{
if (name != null) {
- e = new ClassDefinationExpression(scope, name, super_class, body);
+ e = new ClassDefinitionExpression(scope, name, super_class, body);
} else {
- e = new ClassDefinationExpression(exp, super_class, body);
+ e = new ClassDefinitionExpression(exp, super_class, body);
}
}
;

-moduleDefination
-returns [ModuleDefinationExpression e]
+moduleDefinition
+returns [ModuleDefinitionExpression e]
{
String name = null;
Expression scope = null;
@@ -678,12 +678,12 @@
(body=bodyStatement)?
)
{
- e = new ModuleDefinationExpression(scope, name, body);
+ e = new ModuleDefinitionExpression(scope, name, body);
}
;

-methodDefination
-returns [MethodDefinationExpression e]
+methodDefinition
+returns [MethodDefinitionExpression e]
{
String name = null;
BodyStatement body = null;
@@ -691,8 +691,8 @@
int lineNumber = _t.getLine();
}
: #("def"
- (name=methodName {e = new MethodDefinationExpression(name);}
- |#(SINGLETON_METHOD exp=expression (DOT|COLON2) name=methodName {e
= new MethodDefinationExpression(name, exp);})
+ (name=methodName {e = new MethodDefinitionExpression(name);}
+ |#(SINGLETON_METHOD exp=expression (DOT|COLON2) name=methodName {e
= new MethodDefinitionExpression(name, exp);})
)
( {id=null;func=null;exp=null;}
(id:IDENTIFIER|func:FUNCTION)

Reply all

Reply to author

Forward

0 new messages