git-svn-id: http://www.xerial.org/svn/project/XerialJ/trunk/xerial-core@3608 ae02f08e...

diff --git a/src/main/java/org/xerial/lens/relation/query/lang/LensQuery.tokens b/src/main/java/org/xerial/lens/relation/query/lang/LensQuery.tokens
deleted file mode 100644 (file)
index c2f2c46..0000000
--- a/src/main/java/org/xerial/lens/relation/query/lang/LensQuery.tokens
+++ /dev/null
@@ -1,56 +0,0 @@
-INDEX=15\r
-PATTERNMATCH=9\r
-Match=44\r
-RBrace=35\r
-Regex=45\r
-LBracket=36\r
-Digit=19\r
-Frac=28\r
-HexDigit=21\r
-QUERY=4\r
-ALIAS=11\r
-VALUE=14\r
-Letter=20\r
-Comma=47\r
-Dot=46\r
-EscapeSequence=23\r
-Integer=27\r
-WhiteSpace=56\r
-OPERATOR=7\r
-False=32\r
-Colon=48\r
-LineComment=17\r
-NODEVALUE=12\r
-As=49\r
-SafeFirstLetter=54\r
-Null=33\r
-Star=52\r
-Eq=42\r
-Exp=29\r
-QNameChar=57\r
-RELATION=5\r
-Gt=39\r
-RParen=51\r
-UnicodeChar=22\r
-StringChar=24\r
-True=31\r
-OPERAND=8\r
-LineBreak=18\r
-LParen=50\r
-String=26\r
-SafeLetter=55\r
-LineBreakChar=16\r
-COMPARE=6\r
-QName=58\r
-Geq=41\r
-NODE=10\r
-StringChar_s=25\r
-Neq=43\r
-UnsafeUnicodeChar=53\r
-Double=30\r
-LBrace=34\r
-RBracket=37\r
-Lt=38\r
-NAME=13\r
-Leq=40\r
-WhiteSpaces=59\r

diff --git a/src/main/java/org/xerial/silk/SilkWriter.java b/src/main/java/org/xerial/silk/SilkWriter.java
index d57894e..50e92a6 100644 (file)
--- a/src/main/java/org/xerial/silk/SilkWriter.java
+++ b/src/main/java/org/xerial/silk/SilkWriter.java
@@ -455,8 +455,17 @@ public class SilkWriter {
                 leaf(leafNodeName, v.toString());
         }
         else {
-            SilkWriter c = node(leafNodeName);
-            c.toSilk(v);
+            ObjectLens lens = ObjectLens.getObjectLens(v.getClass());
+            if (lens.hasAttributes()) {
+                SilkWriter c = node(leafNodeName);
+                c.toSilk(v);
+            }
+            else {
+                if (parent != null)
+                    attribute(leafNodeName, v.toString());
+                else
+                    leaf(leafNodeName, v.toString());
+            }
         }
         return this;
     }
@@ -519,7 +528,10 @@ public class SilkWriter {
             }
         }
         else {
-            outputParemters(lens, obj);
+            if (lens.hasAttributes())
+                outputParemters(lens, obj);
+            else
+                out.print(obj.toString());
         }
 
         attributeParenCloseCheck(false);

diff --git a/src/test/java/org/xerial/lens/relation/query/lang/RelationExprTest.java b/src/test/java/org/xerial/lens/relation/query/lang/RelationExprTest.java
index 85abaaf..63f7869 100644 (file)
--- a/src/test/java/org/xerial/lens/relation/query/lang/RelationExprTest.java
+++ b/src/test/java/org/xerial/lens/relation/query/lang/RelationExprTest.java
@@ -41,7 +41,7 @@ public class RelationExprTest {
 \r
     public RelationExpr parse(String query) throws Exception {\r
         RelationExpr e = RelationExpr.parse(query);\r
-        _logger.info(Lens.toJSON(e));\r
+        _logger.info(Lens.toSilk(e));\r
         return e;\r
     }\r
 \r

diff --git a/src/test/java/org/xerial/silk/SilkWriterTest.java b/src/test/java/org/xerial/silk/SilkWriterTest.java
index 23b48e7..9edf94d 100644 (file)
--- a/src/test/java/org/xerial/silk/SilkWriterTest.java
+++ b/src/test/java/org/xerial/silk/SilkWriterTest.java
@@ -24,7 +24,7 @@
 //--------------------------------------\r
 package org.xerial.silk;\r
 \r
-import static org.junit.Assert.*;\r
+import static org.junit.Assert.assertTrue;\r
 \r
 import java.io.StringReader;\r
 import java.io.StringWriter;\r
@@ -34,6 +34,8 @@ import java.util.List;
 import org.junit.After;\r
 import org.junit.Before;\r
 import org.junit.Test;\r
+import org.xerial.lens.Lens;\r
+import org.xerial.lens.relation.TupleIndex;\r
 import org.xerial.silk.SilkWriter.FormatConfig;\r
 import org.xerial.util.FileResource;\r
 import org.xerial.util.log.Logger;\r
@@ -133,4 +135,11 @@ public class SilkWriterTest {
 \r
         _logger.info(buf.toString());\r
     }\r
+\r
+    @Test\r
+    public void tupleIndex() throws Exception {\r
+        TupleIndex i = new TupleIndex(1);\r
+        String s = Lens.toSilk(i);\r
+        _logger.info(s);\r
+    }\r
 }\r