Merge pull request #67 from consultingwerk/feature/SCL-4054

Feature/scl 4054

.project

@@ -30,4 +30,15 @@
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1681401982016</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

build.number

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Wed Mar 15 13:59:34 CET 2023
-build.number=3
+#Thu Apr 13 18:03:49 CEST 2023
+build.number=4

src/com/joanju/proparse/Postlexer.java

@@ -94,6 +94,8 @@ ProToken defined() throws IOException {
 			throwMessage("Bad DEFINED function in &IF preprocessor condition");
 		ProToken argToken = lexer.getAmpIfDefArg();
 		getNextToken();
+		if (currToken.getType() == MAKROREFERENCE)
+			getNextToken();
 		if (currToken.getType() != RIGHTPAREN)
 			throwMessage("Bad DEFINED function in &IF preprocessor condition");
 		return new ProToken(filenameList, NUMBER, prepro.defined(argToken.getText().trim().toLowerCase()));

src/test/SCL4054/TestParseIfDefined.java

@@ -0,0 +1,33 @@
+package test.SCL4054;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+
+import junit.framework.Assert;
+
+import org.prorefactor.refactor.RefactorException;
+import org.prorefactor.treeparser.ParseUnit;
+
+import test.ProparseTestCase;
+
+public class TestParseIfDefined extends ProparseTestCase {
+
+	public void setUp () throws Exception {
+		super.setUp();
+	}
+
+	public void test () throws RefactorException, IOException {
+		File original;
+		ParseUnit pu;
+		byte[] originalText;
+		byte[] nodeText;
+
+		original = new File ("src/test/SCL4054/testCode.p");
+
+		pu = new ParseUnit (original, "ISO8859-1");
+		Assert.assertNotNull(pu);
+		pu.treeParser01();
+		Assert.assertNotNull(pu.getTopNode());		
+	}
+}

src/test/SCL4054/testCode.p

@@ -0,0 +1,21 @@
+/* ***************************  Definitions  ************************** */
+
+BLOCK-LEVEL ON ERROR UNDO, THROW.
+
+&SCOPED-DEFINE Test 42
+
+&SCOPED-DEFINE Test-42
+
+&IF DEFINED (Test-42) NE 0 &THEN
+MESSAGE "bam"
+    VIEW-AS ALERT-BOX.
+&ENDIF
+
+
+&IF DEFINED (Test-{&Test}) NE 0 &THEN
+MESSAGE "yeah"
+    VIEW-AS ALERT-BOX.
+&ENDIF
+
+MESSAGE "boah"
+    VIEW-AS ALERT-BOX.