[tracker/parser] SPARQL: Cleanup

[Jürg Billeter <juergbi src gnome org>]

commit 0357ee80e2edeccfc9eb484b01968d31b0158705
Author: Jürg Billeter <j bitron ch>
Date:   Wed Aug 12 15:47:24 2009 +0200

    SPARQL: Cleanup

 src/libtracker-data/tracker-sparql-query.vala |   25 ++++++++++---------------
 1 files changed, 10 insertions(+), 15 deletions(-)
---
diff --git a/src/libtracker-data/tracker-sparql-query.vala b/src/libtracker-data/tracker-sparql-query.vala
index 32a1f4b..2792186 100644
--- a/src/libtracker-data/tracker-sparql-query.vala
+++ b/src/libtracker-data/tracker-sparql-query.vala
@@ -546,7 +546,7 @@ public class Tracker.SparqlQuery : Object {
 			expect (SparqlTokenType.AS);
 			expect (SparqlTokenType.PN_PREFIX);
 		} else {
-			translate_primary_expression_as_string (sql);
+			translate_expression_as_string (sql);
 		}
 	}
 
@@ -713,7 +713,7 @@ public class Tracker.SparqlQuery : Object {
 			translate_bracketted_expression_as_string (sql);
 			sql.append (" DESC");
 		} else {
-			translate_primary_expression_as_string (sql);
+			translate_expression_as_string (sql);
 		}
 	}
 
@@ -977,10 +977,7 @@ public class Tracker.SparqlQuery : Object {
 		expect (SparqlTokenType.CLOSE_PARENS);
 	}
 
-	void translate_str (StringBuilder sql) throws SparqlError {
-		expect (SparqlTokenType.STR);
-		expect (SparqlTokenType.OPEN_PARENS);
-
+	void translate_expression_as_string (StringBuilder sql) throws SparqlError {
 		switch (current ()) {
 		case SparqlTokenType.IRI_REF:
 		case SparqlTokenType.PN_PREFIX:
@@ -1021,6 +1018,13 @@ public class Tracker.SparqlQuery : Object {
 			}
 			break;
 		}
+	}
+
+	void translate_str (StringBuilder sql) throws SparqlError {
+		expect (SparqlTokenType.STR);
+		expect (SparqlTokenType.OPEN_PARENS);
+
+		translate_expression_as_string (sql);
 
 		expect (SparqlTokenType.CLOSE_PARENS);
 	}
@@ -1104,15 +1108,6 @@ public class Tracker.SparqlQuery : Object {
 		}
 	}
 
-	void translate_primary_expression_as_string (StringBuilder sql) throws SparqlError {
-		if (current () == SparqlTokenType.VAR) {
-			next ();
-			sql.append (get_sql_for_variable (get_last_string ().substring (1)));
-		} else {
-			translate_primary_expression (sql);
-		}
-	}
-
 	DataType translate_primary_expression (StringBuilder sql) throws SparqlError {
 		switch (current ()) {
 		case SparqlTokenType.OPEN_PARENS: