0.14.2 - Fixed issue parsing C# and Java classes that extend/implement multiple types, these are now parsed and returned in the correct order

Author: TeamworkGuy2

CHANGELOG.md

@@ -4,7 +4,17 @@ This project does its best to adhere to [Semantic Versioning](http://semver.org/
 
 
 --------
-###[0.14.1](N/A) - 2016-12-03
+###[0.14.2](N/A) - 2017-02-06
+#### Changed
+* Removed lombok.val usage/dependency from from test classes.
+
+#### Fixed
+* Fixed parsing C# classes that extend/implement multiple types, unrecognized types are assumed to possibly be interfaces.
+* Fixed parsing Java classes that implement multiple types, unrecognized types are assumed to possibly be interfaces.
+
+
+--------
+###[0.14.1](https://github.com/TeamworkGuy2/JParseCode/commit/53806a53d3b8152b35e3166a81dbe9a81a49f354) - 2016-12-03
 #### Changed
 * Updated dependencies to latest versions: jtext-parser@0.11.0, jtext-tokenizer@0.2.0, jparser-primitive@0.2.0
   * This includes a new parsing strategy which tries to parse non-compound tokens from start to finish using one parser at a time without passing the characters to compound parser, this improves performance and simplifies some of the compound parsers, but makes some compound parsers more difficult, such as ending conditions that try to keep track of characters between the start and end of the compound parser segment 

README.md

@@ -1,6 +1,6 @@
 JParseCode
 ==============
-version: 0.14.1
+version: 0.14.2
 
 In progress C#/Java/TypeScript parser tools built atop [JTextParser] (https://github.com/TeamworkGuy2/JTextParser), [Jackson] (https://github.com/FasterXML/jackson-core/) (core, databind, annotations) and half a dozen other utility libraries. 
 

bin/jparse_code-with-tests.jar

@@ -1,5 +1,5 @@
 {
-	"version" : "0.14.1",
+	"version" : "0.14.2",
 	"name" : "jparse-code",
 	"description" : "An in-progress suite of parsing/transpilation tools for C#, Java, and TypeScript code.  Generates simple JSON ASTs.",
 	"homepage" : "https://github.com/TeamworkGuy2/JParseCode",

bin/jparse_code.jar

@@ -1,3 +1,4 @@
+using System;
 using System.Runtime.Serialization;
 
 namespace ParserExamples.Models {
@@ -9,7 +10,7 @@ namespace ParserExamples.Models {
     /// This class is mutable. And it is not thread-safe.
     /// </threadsafety>
     [DataContract]
-    public class TrackInfo {
+    public class TrackInfo : ISerializable, IComparable<TrackInfo> {
 
         /// <value>The track name.</value>
         [DataMember]
@@ -25,6 +26,15 @@ public class TrackInfo {
         /// <value>The track duration in milliseconds</value>
         public long contentId;
 
+
+        public int CompareTo(Implementer other) {
+            return other != null ? (this.Name != null ? this.Name.CompareTo(other.Name) : (other.Name != null ? 1 : 0)) : (this.Name != null ? -1 : 0);
+        }
+
+
+        public void GetObjectData(SerializationInfo info, StreamingContext context) {
+        }
+
     }
 
 }

package-lib.json

@@ -1,5 +1,7 @@
 package ParserExamples.Models;
 
+import java.io.Serializable;
+
 import System.Runtime.Serialization;
 
 /// <summary>
@@ -9,7 +11,7 @@
 /// This class is mutable. And it is not thread-safe.
 /// </threadsafety>
 [DataContract]
-public class TrackInfo {
+public class TrackInfo implements Serializable, Comparable<TrackInfo> {
 
 	/// <value>The track name.</value>
 	@DataMember
@@ -25,4 +27,10 @@ public class TrackInfo {
 	/// <value>The track duration in milliseconds</value>
 	public long contentId;
 
+
+	@Override
+	public int compareTo(TrackInfo o) {
+		return other != null ? (this.Name != null ? this.Name.CompareTo(other.Name) : (other.Name != null ? 1 : 0)) : (this.Name != null ? -1 : 0);
+	}
+
 }

rsc/csharp/ParserExamples/Models/TrackInfo.cs

@@ -20,6 +20,9 @@ public interface KeywordUtil<T_KEYWORD extends AccessModifier> {
 	 */
 	public T_KEYWORD tryToKeyword(String str);
 
+	/** Check if a string is an inheritance keyword (i.e. ':' in C# or 'extends' and 'implements' in Java and TypeScript */
+	public boolean isInheritanceKeyword(String str);
+
 	/** Check if a string is a keyword */
 	public boolean isKeyword(String str);
 

rsc/java/ParserExamples/Models/TrackInfo.java

@@ -181,17 +181,18 @@ private static Entry<String, List<String>> readClassIdentifierAndExtends(Enhance
 		SimpleTree<CodeToken> prevNode = iter.hasPrevious() ? iter.previous() : null;
 
 		// TODO should read ', ' between each name, currently only works with 1 extend/implement class name
-		while(prevNode != null && AstFragType.isIdentifierOrKeyword(prevNode.getData()) && !lang.getKeywordUtil().blockModifiers().is(prevNode.getData())) {
+		while(prevNode != null && AstFragType.isIdentifierOrKeyword(prevNode.getData()) && !lang.getKeywordUtil().blockModifiers().is(prevNode.getData()) && !lang.getKeywordUtil().isInheritanceKeyword(prevNode.getData().getText())) {
 			names.add(prevNode.getData().getText());
 			prevNode = iter.hasPrevious() ? iter.previous() : null;
 			if(iter.hasPrevious()) { prevCount++; }
 		}
 
 		// if the class signature extends/implements, then the identifiers just read are the class/interface names, next read the actual class name
-		if(prevNode != null && prevNode.getData().getText().trim().equals(":")) {
+		if(prevNode != null && prevNode.getData().getText().equals(":")) {
 			prevNode = iter.hasPrevious() ? iter.previous() : null;
 			if(iter.hasPrevious()) { prevCount++; }
 			if(prevNode != null && AstFragType.isIdentifierOrKeyword(prevNode.getData()) && !lang.getKeywordUtil().blockModifiers().is(prevNode.getData())) {
+				Collections.reverse(names);
 				val extendImplementNames = names;
 				val className = prevNode.getData().getText();
 				nameCompoundRes = Tuples.of(className, extendImplementNames);

src/twg2/parser/codeParser/KeywordUtil.java

@@ -211,6 +211,12 @@ public CsKeyword tryToKeyword(String str) {
 		}
 
 
+		@Override
+		public boolean isInheritanceKeyword(String str) {
+			return ":".equals(str);
+		}
+
+
 		@Override
 		public boolean isKeyword(String str) {
 			return Arrays.binarySearch(keywords, str) > -1;