Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Kucera2008-04-09 21:14:33 +0000
committerMike Kucera2008-04-09 21:14:33 +0000
commitf58850d5baca3b69696548961025cb60c5ac89d6 (patch)
treef1fe430353931a928e4f77c449d3bacbd4030ef1
parent39f7e3c0381ce1978a5f0aa1e558575c51a211fa (diff)
downloadorg.eclipse.cdt-f58850d5baca3b69696548961025cb60c5ac89d6.tar.gz
org.eclipse.cdt-f58850d5baca3b69696548961025cb60c5ac89d6.tar.xz
org.eclipse.cdt-f58850d5baca3b69696548961025cb60c5ac89d6.zip
fixed problems in UPC test suite
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java16
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCParserTestSuite.java (renamed from upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/AutomatedIntegrationSuite.java)2
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/upc/UPCLanguage.java4
3 files changed, 10 insertions, 12 deletions
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java
index a3245777355..f734dfc8bce 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCLanguageExtensionTests.java
@@ -40,6 +40,7 @@ import org.eclipse.cdt.core.dom.upc.ast.IUPCASTForallStatement;
import org.eclipse.cdt.core.dom.upc.ast.IUPCASTKeywordExpression;
import org.eclipse.cdt.core.dom.upc.ast.IUPCASTSimpleDeclSpecifier;
import org.eclipse.cdt.core.dom.upc.ast.IUPCASTSynchronizationStatement;
+import org.eclipse.cdt.core.dom.upc.ast.IUPCASTTypeIdExpression;
import org.eclipse.cdt.core.dom.upc.ast.IUPCASTUnaryExpression;
import org.eclipse.cdt.core.lrparser.tests.ParseHelper;
@@ -488,9 +489,6 @@ public class UPCLanguageExtensionTests extends TestCase {
IASTStatement[] body = ((IASTCompoundStatement)main.getBody()).getStatements();
assertEquals(8, body.length);
-
-
- @SuppressWarnings("unused")
IASTTypeIdExpression idexpr = (IASTTypeIdExpression)((IASTExpressionStatement)body[0]).getExpression();
IASTUnaryExpression cexpr = (IASTUnaryExpression)((IASTExpressionStatement)body[1]).getExpression();
@@ -498,20 +496,20 @@ public class UPCLanguageExtensionTests extends TestCase {
IUPCASTUnaryExpression expr;
- expr = (IUPCASTUnaryExpression)((IASTExpressionStatement)body[2]).getExpression();
- assertEquals(IUPCASTUnaryExpression.op_upc_localsizeof, expr.getOperator());
+ idexpr = (IUPCASTTypeIdExpression)((IASTExpressionStatement)body[2]).getExpression();
+ assertEquals(IUPCASTUnaryExpression.op_upc_localsizeof, idexpr.getOperator());
expr = (IUPCASTUnaryExpression)((IASTExpressionStatement)body[3]).getExpression();
assertEquals(IUPCASTUnaryExpression.op_upc_localsizeof, expr.getOperator());
- expr = (IUPCASTUnaryExpression)((IASTExpressionStatement)body[4]).getExpression();
- assertEquals(IUPCASTUnaryExpression.op_upc_blocksizeof, expr.getOperator());
+ idexpr = (IUPCASTTypeIdExpression)((IASTExpressionStatement)body[4]).getExpression();
+ assertEquals(IUPCASTUnaryExpression.op_upc_blocksizeof, idexpr.getOperator());
expr = (IUPCASTUnaryExpression)((IASTExpressionStatement)body[5]).getExpression();
assertEquals(IUPCASTUnaryExpression.op_upc_blocksizeof, expr.getOperator());
- expr = (IUPCASTUnaryExpression)((IASTExpressionStatement)body[6]).getExpression();
- assertEquals(IUPCASTUnaryExpression.op_upc_elemsizeof, expr.getOperator());
+ idexpr = (IUPCASTTypeIdExpression)((IASTExpressionStatement)body[6]).getExpression();
+ assertEquals(IUPCASTUnaryExpression.op_upc_elemsizeof, idexpr.getOperator());
expr = (IUPCASTUnaryExpression)((IASTExpressionStatement)body[7]).getExpression();
assertEquals(IUPCASTUnaryExpression.op_upc_elemsizeof, expr.getOperator());
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/AutomatedIntegrationSuite.java b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCParserTestSuite.java
index eb8a7ec788e..d1afdb0cbe1 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/AutomatedIntegrationSuite.java
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/src/org/eclipse/cdt/core/parser/upc/tests/UPCParserTestSuite.java
@@ -13,7 +13,7 @@ package org.eclipse.cdt.core.parser.upc.tests;
import junit.framework.Test;
import junit.framework.TestSuite;
-public class AutomatedIntegrationSuite extends TestSuite {
+public class UPCParserTestSuite extends TestSuite {
public static Test suite() {
TestSuite suite = new TestSuite();
diff --git a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/upc/UPCLanguage.java b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/upc/UPCLanguage.java
index 73baaef7ec3..9aeb13a0195 100644
--- a/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/upc/UPCLanguage.java
+++ b/upc/org.eclipse.cdt.core.parser.upc/src/org/eclipse/cdt/core/dom/upc/UPCLanguage.java
@@ -26,6 +26,7 @@ import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.core.parser.IScanner;
import org.eclipse.cdt.core.parser.ParserLanguage;
import org.eclipse.cdt.internal.core.dom.parser.c.CASTTranslationUnit;
+import org.eclipse.cdt.internal.core.dom.parser.upc.UPCParser;
/**
@@ -57,8 +58,7 @@ public class UPCLanguage extends BaseExtensibleLanguage {
@Override
public IParser getParser() {
- //return new UPCParser();
- return null;
+ return new UPCParser();
}
/**

Back to the top