Merge https://github.com/parallaxinc/PropellerIDE

Author: bweir

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "src/openspin/OpenSpin"]
+[submodule "src/openspin/repo"]
 	path = src/openspin/repo
-	url = https://github.com/bweir/OpenSpin
+	url = https://github.com/bweir/OpenSpin.git

makefile

@@ -20,7 +20,7 @@ VERSION			:=	$(shell echo $(shell grep -r VERSION= propelleride.pri \
 					| sed -e 's/ /./g')
 
 # if CPU (uname -m) equals...
-ifeq ($(shell uname -n),raspberrypi)		# if Raspberry Pi
+ifeq ($(shell cat /etc/os-release | grep "ID=raspbian"),ID=raspbian) # if Raspberry Pi
 	CPU := armhf
 else
 	ifeq ($(shell uname -m),i686)			# if i686

src/propelleride/SpinParser.cpp

@@ -1,6 +1,6 @@
 #include "SpinParser.h"
 
-#define KEY_ELEMENT_SEP ":"
+#define KEY_ELEMENT_SEP ':'
 
 SpinParser::SpinParser()
 {
@@ -71,17 +71,11 @@ QStringList SpinParser::spinFileTree(QString file, QString libpath)
     QStringList nodes;
     foreach(key, keys) {
         value = db[key];
-        QStringList levels = key.split("/");
-        int lcount = levels.count()-1;
-        QStringList keyel = levels[lcount].split(KEY_ELEMENT_SEP);
-        if(keyel.count() < 2)
-            continue;
-        if(QString(keyel[0]).compare(keyel[1]) == 0) {
-            //qDebug() << key;
-            objectInfo(value, subnode, subfile);
-            //for(int n = 0; n < lcount; n++) subfile = "    " + subfile;
-            nodes.append(subfile);
-        }
+        QStringList tags = value.split("\t");
+		if (tags.count() < 4 || !tags[3].startsWith(SpinKinds[K_OBJECT].letter))
+            continue;	// short list or not an object
+        objectInfo(value, subnode, subfile);
+        nodes.append(subfile);
     }
     // Indent later. Just sort for now.
 #ifdef QT5
@@ -93,7 +87,6 @@ QStringList SpinParser::spinFileTree(QString file, QString libpath)
         QString ns = nodes.at(n);
         spinFiles.append(ns.mid(ns.lastIndexOf(":")+1));
     }
-
     return spinFiles;
 }
 
@@ -421,9 +414,6 @@ void SpinParser::match_dat (QString p, int line)
 
 void SpinParser::match_object (QString p, int line)
 {
-    QString tag = "";
-    QString subfile = "";
-    QString subnode = "";
     int len = p.indexOf(":");
     if(p.indexOf(":=") > 0)
         len = 0;
@@ -440,15 +430,38 @@ void SpinParser::match_object (QString p, int line)
         if(s.contains("[",Qt::CaseInsensitive))
             p = p.mid(0,p.indexOf("[",0,Qt::CaseInsensitive));
         p = p.trimmed();
-        tag = s+"\t"+currentFile+"\t"+p+"\t"+SpinKinds[K_OBJECT].letter;
-        objectInfo(tag, subnode, subfile);
+
+        QString key = objectNode+KEY_ELEMENT_SEP+s;
+        QString tag = s+"\t"+currentFile+"\t"+p+"\t"+SpinKinds[K_OBJECT].letter;
+        QString dummy, subnode, subfile, parent, curr = key;
+
+        objectInfo(tag, subnode, subfile, parent);
         QString file = checkFile(subfile);
-        if(QFile::exists(file) == false)
-            return;
-        QString key = objectNode+"/"+subnode+KEY_ELEMENT_SEP+s;
-        if(db.contains(key) == false)
+
+		// file is missing, ignore object
+        if(!QFile::exists(file)) return;
+			
+		// avoid circular references, do this by scanning all existing
+		// parents of this particular key (*/*/*:*)
+		for (;;) {
+			int index;
+			// invalid match, ignore object
+			if (parent == file) {
+				qDebug() << "circular reference: " << s << currentFile;
+				return;
+			}
+			// cut off key at KEY_ELEMENT_SEP
+			if ((index = curr.lastIndexOf(KEY_ELEMENT_SEP)) == -1) break;
+			curr.resize(index);
+			// replace last / with KEY_ELEMENT_SEP
+			if ((index = curr.lastIndexOf('/')) == -1) break;
+			curr[index] = QChar(KEY_ELEMENT_SEP);
+			// extract parent file
+			objectInfo(db[curr], dummy, dummy, parent);
+		}
+        if(!db.contains(key))
             db.insert(key,tag+"\t"+QString("%1").arg(line));
-        // qDebug() << objectNode+"/"+subnode << " :: " << tag;
+
         findSpinTags(subfile,objectNode+"/"+subnode);
     }
 }
@@ -531,10 +544,16 @@ void SpinParser::match_var (QString p, int line)
 }
 
 int SpinParser::objectInfo(QString tag, QString &name, QString &file)
+{
+	return objectInfo(tag, name, file, file);
+}
+
+int SpinParser::objectInfo(QString tag, QString &name, QString &file, QString &parent)
 {
     QStringList list = tag.split("\t",QString::KeepEmptyParts);
     if(list.length() == 0)
         return 0;
+
     name = QString(list[0]).trimmed();
     file = QString(list[2]).trimmed();
     file = file.mid(file.indexOf("\"")+1);
@@ -544,6 +563,9 @@ int SpinParser::objectInfo(QString tag, QString &name, QString &file)
     if(file.contains(".spin",Qt::CaseInsensitive) == false)
         file += ".spin";
 
+	if (parent != file)
+		parent = QString(list[1]).trimmed();
+
     return list.length();
 }
 

src/propelleride/SpinParser.h

@@ -74,7 +74,7 @@ class SpinParser
 
     typedef struct sKindOption {
         bool enabled;           /* are tags for kind enabled? */
-        int letter;             /* kind letter */
+        char letter;            /* kind letter */
         QString name;           /* kind name */
         QString description;    /* displayed in --help output */
     } kindOption;
@@ -123,6 +123,7 @@ class SpinParser
     void match_pub (QString p, int line);
     void match_var (QString p, int line);
     int objectInfo(QString tag, QString &name, QString &file);
+    int objectInfo(QString tag, QString &name, QString &file, QString &parent);
     QString checkFile(QString fileName);
     void findSpinTags (QString fileName, QString objnode);