eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-01-27 18:31:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix loose git merge issue sitting in comments for PdeParseTreeLi..

Browse Source
This commit is contained in:
Sam Pottinger
2019-11-04 17:08:15 -08:00
parent 9fd00981b3
commit 434b722a77
1 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
java/src/processing/mode/java/preproc/PdeParseTreeListener.java
View File

@@ -506,30 +506,6 @@ public class PdeParseTreeListener extends ProcessingBaseListener {
}
/**
<<<<<<< HEAD
* Check if this contains an annation.
*
* @param context The modifier context to check.
* @return True if annotation. False otherwise
*/
private boolean isAnnoation(ProcessingParser.ModifierContext context) {
if (context.getChildCount() == 0) {
return false;
}
ProcessingParser.ClassOrInterfaceModifierContext classModifierCtx;
if (!(context.getChild(0) instanceof ProcessingParser.ClassOrInterfaceModifierContext)) {
return false;
}
classModifierCtx = (ProcessingParser.ClassOrInterfaceModifierContext) context.getChild(0);
return classModifierCtx.getChild(0) instanceof ProcessingParser.AnnotationContext;
}
/**
=======
>>>>>>> master
* Endpoint for ANTLR to call after parsing a primitive type name.
*
* <p>