svn commit: r1544528 - /jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java

[andy]

Author: andy
Date: Fri Nov 22 13:27:27 2013
New Revision: 1544528

URL: http://svn.apache.org/r1544528
Log:
Optional DOT after [...] inside {}

Modified:
    
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java

Modified: 
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java?rev=1544528&r1=1544527&r2=1544528&view=diff
==============================================================================
--- 
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java 
(original)
+++ 
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java 
Fri Nov 22 13:27:27 2013
@@ -194,7 +194,9 @@ public abstract class LangTurtleBase ext
 
         boolean maybeList = lookingAt(LPAREN) ;
         
-        // TriplesSameSubject -> TriplesNode PropertyList?
+        // Turtle: TriplesSameSubject -> TriplesNode PropertyList?
+        // TriG:   (blankNodePropertyList | collection) predicateObjectList? 
'.'
+        //         labelOrSubject (wrappedGraph | predicateObjectList '.')
         if ( peekTriplesNodeCompound() ) {
             Node n = triplesNodeCompound() ;
 
@@ -208,7 +210,6 @@ public abstract class LangTurtleBase ext
             // There must be a predicate and object.
 
             // -- If strict turtle.
-            // TODO Also for { ( 1 2 3 ) }
             if ( profile.isStrictMode() && maybeList ) {
                 if ( peekPredicate() ) {
                     predicateObjectList(n) ;
@@ -229,12 +230,11 @@ public abstract class LangTurtleBase ext
                 return ;
             }
 
-            if ( peekPredicate() ) {
+            if ( peekPredicate() )
                 predicateObjectList(n) ;
-                expectEndOfTriples() ;
-                return ;
-            }
-            exception(peekToken(), "Unexpected token : %s", peekToken()) ;
+            expectEndOfTriples() ;
+            //exception(peekToken(), "Unexpected token : %s", peekToken()) ;
+            return ;
         }
         exception(peekToken(), "Out of place: %s", peekToken()) ;
     }