diff options
author | ahaase | 2008-01-30 13:23:25 +0000 |
---|---|---|
committer | ahaase | 2008-01-30 13:23:25 +0000 |
commit | 137c0f01563aa33ea35881d88a8106cda8484897 (patch) | |
tree | d1c0d364700b31bfacbe5dc17c3700720cde17ea | |
parent | da88e1b69fea2de29941fea3dafe2d72f810ba9e (diff) | |
download | org.eclipse.xpand-137c0f01563aa33ea35881d88a8106cda8484897.tar.gz org.eclipse.xpand-137c0f01563aa33ea35881d88a8106cda8484897.tar.xz org.eclipse.xpand-137c0f01563aa33ea35881d88a8106cda8484897.zip |
renamed "globalVar" to "globalParam"
-rw-r--r-- | plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/ExecutionContextImpl.java | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/GlobalParamContextImpl.java (renamed from plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/GlobalVarContextImpl.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/common/ExecutionContext.java | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/common/GlobalParamContext.java (renamed from plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/common/GlobalVarContext.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/expr/GlobalParamExpression.java (renamed from plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/expr/GlobalVarExpression.java) | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.xtend.middleend.old/src/org/eclipse/xtend/middleend/old/OldExpressionConverter.java | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/ExecutionContextImpl.java b/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/ExecutionContextImpl.java index cfd07518..0226e93e 100644 --- a/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/ExecutionContextImpl.java +++ b/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/ExecutionContextImpl.java @@ -18,7 +18,7 @@ import org.eclipse.xtend.backend.common.CreationCache; import org.eclipse.xtend.backend.common.ExecutionContext; import org.eclipse.xtend.backend.common.FunctionDefContext; import org.eclipse.xtend.backend.common.FunctionInvoker; -import org.eclipse.xtend.backend.common.GlobalVarContext; +import org.eclipse.xtend.backend.common.GlobalParamContext; import org.eclipse.xtend.backend.common.LocalVarContext; import org.eclipse.xtend.backend.common.SourcePos; @@ -33,7 +33,7 @@ final class ExecutionContextImpl implements ExecutionContext { private LocalVarContext _localVarContext = new LocalVarContext (); private final FunctionInvoker _functionInvoker = new FunctionInvokerImpl (); private final BackendTypesystem _typeSystem; - private final GlobalVarContext _globalVarContext = new GlobalVarContextImpl (); + private final GlobalParamContext _globalParamContext = new GlobalParamContextImpl (); private final ContributionStateContext _contributionStateContext = new ContributionStateContext (); @@ -70,8 +70,8 @@ final class ExecutionContextImpl implements ExecutionContext { return _typeSystem; } - public GlobalVarContext getGlobalVarContext() { - return _globalVarContext; + public GlobalParamContext getGlobalParamContext() { + return _globalParamContext; } public void logNullDeRef (SourcePos pos) { diff --git a/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/GlobalVarContextImpl.java b/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/GlobalParamContextImpl.java index 00fd1779..9b4ddfd5 100644 --- a/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/GlobalVarContextImpl.java +++ b/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/GlobalParamContextImpl.java @@ -13,17 +13,17 @@ package org.eclipse.xtend.backend; import java.util.HashMap; import java.util.Map; -import org.eclipse.xtend.backend.common.GlobalVarContext; +import org.eclipse.xtend.backend.common.GlobalParamContext; /** * * @author Arno Haase (http://www.haase-consulting.com) */ -final class GlobalVarContextImpl implements GlobalVarContext { +final class GlobalParamContextImpl implements GlobalParamContext { private final Map<String, Object> _globalVars = new HashMap<String, Object> (); - public Map<String, Object> getGlobalVars() { + public Map<String, Object> getGlobalParams() { return _globalVars; } } diff --git a/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/common/ExecutionContext.java b/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/common/ExecutionContext.java index 6cd3ef81..0bf1274e 100644 --- a/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/common/ExecutionContext.java +++ b/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/common/ExecutionContext.java @@ -19,7 +19,7 @@ public interface ExecutionContext { LocalVarContext getLocalVarContext (); void setLocalVarContext (LocalVarContext ctx); - GlobalVarContext getGlobalVarContext (); + GlobalParamContext getGlobalParamContext (); BackendTypesystem getTypesystem (); FunctionDefContext getFunctionDefContext (); diff --git a/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/common/GlobalVarContext.java b/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/common/GlobalParamContext.java index 78807929..16ded3ee 100644 --- a/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/common/GlobalVarContext.java +++ b/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/common/GlobalParamContext.java @@ -17,6 +17,6 @@ import java.util.Map; * * @author Arno Haase (http://www.haase-consulting.com) */ -public interface GlobalVarContext { - Map<String, Object> getGlobalVars(); +public interface GlobalParamContext { + Map<String, Object> getGlobalParams(); } diff --git a/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/expr/GlobalVarExpression.java b/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/expr/GlobalParamExpression.java index b6f8482f..6456d53a 100644 --- a/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/expr/GlobalVarExpression.java +++ b/plugins/org.eclipse.xtend.backend/src/org/eclipse/xtend/backend/expr/GlobalParamExpression.java @@ -20,16 +20,16 @@ import org.eclipse.xtend.backend.common.SourcePos; * * @author Arno Haase (http://www.haase-consulting.com) */ -public final class GlobalVarExpression extends ExpressionBase { +public final class GlobalParamExpression extends ExpressionBase { private final String _varName; - public GlobalVarExpression (String varName, SourcePos sourcePos) { + public GlobalParamExpression (String varName, SourcePos sourcePos) { super(sourcePos); _varName = varName; } @Override protected Object evaluateInternal(ExecutionContext ctx) { - return ctx.getGlobalVarContext().getGlobalVars().get (_varName); + return ctx.getGlobalParamContext().getGlobalParams().get (_varName); } } diff --git a/plugins/org.eclipse.xtend.middleend.old/src/org/eclipse/xtend/middleend/old/OldExpressionConverter.java b/plugins/org.eclipse.xtend.middleend.old/src/org/eclipse/xtend/middleend/old/OldExpressionConverter.java index a16f0747..2a0ccc1d 100644 --- a/plugins/org.eclipse.xtend.middleend.old/src/org/eclipse/xtend/middleend/old/OldExpressionConverter.java +++ b/plugins/org.eclipse.xtend.middleend.old/src/org/eclipse/xtend/middleend/old/OldExpressionConverter.java @@ -115,7 +115,7 @@ final class OldExpressionConverter { return convertBooleanOperation ((BooleanOperation) expr); if (expr instanceof GlobalVarExpression) - return new org.eclipse.xtend.backend.expr.GlobalVarExpression (((GlobalVarExpression) expr).getVarName(), getSourcePos(expr)); + return new org.eclipse.xtend.backend.expr.GlobalParamExpression (((GlobalVarExpression) expr).getVarName(), getSourcePos(expr)); if (expr instanceof LetExpression) return convertLetExpression((LetExpression) expr); if (expr instanceof ChainExpression) |