integrated file read/write functionality, added tests (closes #11)

Author: danvegeto

PipelineScript/src/com/pipelinescript/FileManager.java

@@ -14,20 +14,22 @@ public class FileManager
 
 	public static Table readTable(String file)
 	{
-		String path = DATA_DIR + "/" + file;
+		String[] lines = read(file).split("\n");
 
-		return new Table(read(path));
+		return new Table(lines);
 	}
 
 	public static void writeTable(String file, Table data)
 	{
 		String path = DATA_DIR + "/" + file;
 
-		write(path, data.getLines());
+		write(path, data.toString());
 	}
 
-	private static String[] read(String path)
+	public static String read(String file)
 	{
+		String path = DATA_DIR + "/" + file;
+		
 		List<String> lines = new LinkedList<String>();
 
 		try
@@ -49,16 +51,18 @@ private static String[] read(String path)
 			e.printStackTrace();
 		}
 
-		return lines.toArray(new String[]{});
+		return String.join("\n", lines);
 	}
 
-	private static void write(String path, String[] data)
+	public static void write(String file, String data)
 	{
+		String path = DATA_DIR + "/" + file;
+		
 		try
 		{
 			PrintWriter writer = new PrintWriter(new FileWriter(path));
 
-			for(String line : data)
+			for(String line : data.split("\n"))
 			{
 				writer.println(line);
 			}

data/bar.txt

@@ -0,0 +1 @@
+foo

doc/examples.md

@@ -278,45 +278,43 @@ Note: The first argument will be the name of the pipeline file, like in Shell sc
 
 PipelineScript
 ```
-{{1, 2}, {3, 4}} > "foobar.csv"
-table t = @"foobar.csv"
-print t
+"foo" -> "bar.txt"
+text x = @"bar.txt"
+print x
 ```
 
 Java
 ```java
-FileManager.writeTable("foobar.csv", new Table(new String[][]{{"1", "2"}, {"3", "4"}}));
-Table t = FileManager.readTable("foobar.csv");
-System.out.println(t);
+FileManager.write("bar.txt", "foo");
+String x = FileManager.read("bar.txt");
+System.out.println(x);
 ```
 
 Output
 ```
-1,2
-3,4
+foo
 ```
 
 
 ###file_write
 
 PipelineScript
 ```
-table t = {{1, 2}, {3, 4}}
-t > "foobar.csv"
-print @"foobar.csv"
+text x = "foo"
+x -> "bar.txt"
+print @"bar.txt"
 ```
 
 Java
 ```java
-Table t = new Table(new String[][]{{"1", "2"}, {"3", "4"}});
-FileManager.writeTable("foobar.csv", t);
-System.out.println(FileManager.readTable("foobar.csv");
+String x = "foo";
+FileManager.write("bar.txt", x);
+System.out.println(FileManager.read("bar.txt"));
 ```
 
 Output
 ```
-1,2
-3,4
+foo
 ```
 
 
@@ -344,5 +342,3 @@ PERSON  President Obama
 PERSON  Putin
 LOCATION  Geneva
 ```
-
-

pls.py

@@ -16,7 +16,7 @@
 	'LT', 'GT', 'LEQ', 'GEQ', 'DE', 'NE',
 	'AND', 'OR', 'NOT',
 	'NUM', 'TEXT', 'TABLE', 'DOT', 'GRAPH',
-        'DOLLAR'
+    'DOLLAR', 'FREAD', 'FWRITE'
 	)
 
 # operator precedence
@@ -51,6 +51,8 @@
 t_NAME	= r'[a-zA-Z_][a-zA-Z0-9_]*'
 t_DOT = r'\.'
 t_DOLLAR = r'\$'
+t_FREAD = r'\@'
+t_FWRITE = r'->'
 
 # ignored characters
 t_ignore = " \t"
@@ -484,12 +486,20 @@ def p_entry2(t):
 	t[0] = "{%s}"%t[2]
 
 ######################### SHELL_ARGS
-	
+
 def p_shell_args(t):
         'value : DOLLAR value'
         t[0] = "args[(int)%s]"%t[2]
-        
 
+######################### FILE_IO
+
+def p_file_read(t):
+        'value : FREAD value'
+        t[0] = "FileManager.read(%s)"%t[2]
+
+def p_file_write(t):
+        'statement : value FWRITE value'
+        t[0] = "FileManager.write(%s, %s);"%(t[3], t[1])
 
 
 
@@ -542,7 +552,8 @@ def get_indexed_array_type(x):
 
 
 print header
-print "public class Output\n{"
+print "package com.pipelinescript;"
+print "public class Pipeline\n{"
 print functions
 print "public static void main(String[] args) throws Exception\n{"
 print body

pls.sh

@@ -1,4 +1,5 @@
-python pls.py $1 > Output.java 2> /dev/null
-javac Output.java 2> /dev/null
-java -cp . Output $*
-rm Output.java Output.class parser.out parsetab.py parsetab.pyc 2> /dev/null
+python pls.py $1 > PipelineScript/src/com/pipelinescript/Pipeline.java 2> /dev/null
+javac -d PipelineScript/bin PipelineScript/src/com/pipelinescript/*.java 2> /dev/null
+java -cp PipelineScript/bin com.pipelinescript.Pipeline
+rm PipelineScript/src/com/pipelinescript/Pipeline.java
+rm parser.out parsetab.py parsetab.pyc 2> /dev/null

tests/file_read.pls

@@ -0,0 +1,3 @@
+"foo" -> "bar.txt"
+text x = @"bar.txt"
+print x

tests/file_write.pls

@@ -0,0 +1,3 @@
+text x = "foo"
+x -> "bar.txt"
+print @"bar.txt"