summaryrefslogtreecommitdiff
path: root/java/test/Freeze/complex
diff options
context:
space:
mode:
Diffstat (limited to 'java/test/Freeze/complex')
-rw-r--r--java/test/Freeze/complex/Client.java350
-rw-r--r--java/test/Freeze/complex/Complex/AddNodeI.java6
-rw-r--r--java/test/Freeze/complex/Complex/MultiplyNodeI.java6
-rw-r--r--java/test/Freeze/complex/Complex/NumberNodeI.java4
-rw-r--r--java/test/Freeze/complex/Complex/ObjectFactoryI.java30
-rw-r--r--java/test/Freeze/complex/ParseError.java2
-rw-r--r--java/test/Freeze/complex/Parser.java242
7 files changed, 320 insertions, 320 deletions
diff --git a/java/test/Freeze/complex/Client.java b/java/test/Freeze/complex/Client.java
index 5ab5e5ff25a..e4257f9bee9 100644
--- a/java/test/Freeze/complex/Client.java
+++ b/java/test/Freeze/complex/Client.java
@@ -24,215 +24,215 @@ public class Client
private int
validate(String dbName)
- throws DatabaseException
+ throws DatabaseException
{
- Complex.ComplexDict m = new Complex.ComplexDict(_connection, dbName, true);
-
- try
- {
- Parser parser = new Parser();
-
- System.out.print("testing database expressions... ");
- java.util.Iterator p = m.entrySet().iterator();
- while(p.hasNext())
- {
- java.util.Map.Entry e = (java.util.Map.Entry)p.next();
-
- Complex.Key key = (Complex.Key)e.getKey();
-
- //
- // Verify the stored record is correct.
- //
- test(key.result == ((Complex.Node)e.getValue()).calc());
-
- //
- // Verify that the expression & result again.
- //
- Complex.Node root = parser.parse(key.expression);
- test(root.calc(null) == key.result);
- }
- System.out.println("ok");
- }
- catch(ParseError e)
- {
- e.printStackTrace();
- test(false);
- }
-
- m.close();
-
- return 0;
+ Complex.ComplexDict m = new Complex.ComplexDict(_connection, dbName, true);
+
+ try
+ {
+ Parser parser = new Parser();
+
+ System.out.print("testing database expressions... ");
+ java.util.Iterator p = m.entrySet().iterator();
+ while(p.hasNext())
+ {
+ java.util.Map.Entry e = (java.util.Map.Entry)p.next();
+
+ Complex.Key key = (Complex.Key)e.getKey();
+
+ //
+ // Verify the stored record is correct.
+ //
+ test(key.result == ((Complex.Node)e.getValue()).calc());
+
+ //
+ // Verify that the expression & result again.
+ //
+ Complex.Node root = parser.parse(key.expression);
+ test(root.calc(null) == key.result);
+ }
+ System.out.println("ok");
+ }
+ catch(ParseError e)
+ {
+ e.printStackTrace();
+ test(false);
+ }
+
+ m.close();
+
+ return 0;
}
private int
populate(String dbName)
- throws DatabaseException
+ throws DatabaseException
{
- String[] expressions =
- {
- "2",
- "10",
- "2+(5*3)",
- "5*(2+3)",
- "10+(10+(20+(8*(2*(3*2+4+5+6)))))"
- };
-
- Complex.ComplexDict m = new Complex.ComplexDict(_connection, dbName, true);
-
- try
- {
- Parser parser = new Parser();
-
- System.out.print("populating the database... ");
- for(int i = 0 ; i < expressions.length; ++i)
- {
- Complex.Node root = parser.parse(expressions[i]);
- assert(root != null);
- Complex.Key k = new Complex.Key();
- k.expression = expressions[i];
- k.result = root.calc(null);
- m.put(k, root);
- }
- System.out.println("ok");
- }
- catch(ParseError e)
- {
- e.printStackTrace();
- test(false);
- }
-
- m.close();
- return 0;
+ String[] expressions =
+ {
+ "2",
+ "10",
+ "2+(5*3)",
+ "5*(2+3)",
+ "10+(10+(20+(8*(2*(3*2+4+5+6)))))"
+ };
+
+ Complex.ComplexDict m = new Complex.ComplexDict(_connection, dbName, true);
+
+ try
+ {
+ Parser parser = new Parser();
+
+ System.out.print("populating the database... ");
+ for(int i = 0 ; i < expressions.length; ++i)
+ {
+ Complex.Node root = parser.parse(expressions[i]);
+ assert(root != null);
+ Complex.Key k = new Complex.Key();
+ k.expression = expressions[i];
+ k.result = root.calc(null);
+ m.put(k, root);
+ }
+ System.out.println("ok");
+ }
+ catch(ParseError e)
+ {
+ e.printStackTrace();
+ test(false);
+ }
+
+ m.close();
+ return 0;
}
static void
usage(String name)
{
- System.out.println("Usage: " + name + " [options] validate|populate");
- System.out.println("Options:");
- System.out.println("--dbdir Location of the database directory.");
+ System.out.println("Usage: " + name + " [options] validate|populate");
+ System.out.println("Options:");
+ System.out.println("--dbdir Location of the database directory.");
}
private int
run(String[] args, String dbName)
- throws DatabaseException
+ throws DatabaseException
{
- //
- // Register a factory for the node types.
- //
- Ice.ObjectFactory factory = new Complex.ObjectFactoryI();
- _communicator.addObjectFactory(factory, "::Complex::NumberNode");
- _communicator.addObjectFactory(factory, "::Complex::AddNode");
- _communicator.addObjectFactory(factory, "::Complex::MultiplyNode");
-
- if(args.length != 0 && args[0].equals("populate"))
- {
- return populate(dbName);
- }
- if(args.length != 0 && args[0].equals("validate"))
- {
- return validate(dbName);
- }
- usage(progName);
-
+ //
+ // Register a factory for the node types.
+ //
+ Ice.ObjectFactory factory = new Complex.ObjectFactoryI();
+ _communicator.addObjectFactory(factory, "::Complex::NumberNode");
+ _communicator.addObjectFactory(factory, "::Complex::AddNode");
+ _communicator.addObjectFactory(factory, "::Complex::MultiplyNode");
+
+ if(args.length != 0 && args[0].equals("populate"))
+ {
+ return populate(dbName);
+ }
+ if(args.length != 0 && args[0].equals("validate"))
+ {
+ return validate(dbName);
+ }
+ usage(progName);
+
return 0;
}
private void
close()
{
- _connection.close();
+ _connection.close();
}
private
Client(Ice.Communicator communicator, String envName)
{
- _communicator = communicator;
- _connection = Freeze.Util.createConnection(communicator, envName);
+ _communicator = communicator;
+ _connection = Freeze.Util.createConnection(communicator, envName);
}
static public void
main(String[] args)
{
- int status;
- Ice.Communicator communicator = null;
- String envName = "db";
-
- try
- {
- //
- // Scan for --dbdir command line argument.
- //
- int i = 0;
- while(i < args.length)
- {
- if(args[i].equals("--dbdir"))
- {
- if(i +1 >= args.length)
- {
- usage(progName);
- System.exit(1);
- }
-
- envName = args[i+1];
- envName += "/";
- envName += "db";
-
- //
- // Consume arguments
- //
- String[] arr = new String[args.length - 2];
- System.arraycopy(args, 0, arr, 0, i);
- if(i < args.length - 2)
- {
- System.arraycopy(args, i + 2, arr, i, args.length - i - 2);
- }
- args = arr;
- }
- else
- {
- ++i;
- }
- }
-
- Ice.StringSeqHolder holder = new Ice.StringSeqHolder();
- holder.value = args;
- communicator = Ice.Util.initialize(holder);
- args = holder.value;
- Client client = new Client(communicator, envName);
- try
- {
- status = client.run(args, "test");
- }
- finally
- {
- client.close();
- }
- }
- catch(Exception ex)
- {
- ex.printStackTrace();
- System.err.println(ex);
- status = 1;
- }
-
- if(communicator != null)
- {
- try
- {
- communicator.destroy();
- }
- catch(Exception ex)
- {
- System.err.println(ex);
- status = 1;
- }
- }
-
- System.gc();
- System.exit(status);
+ int status;
+ Ice.Communicator communicator = null;
+ String envName = "db";
+
+ try
+ {
+ //
+ // Scan for --dbdir command line argument.
+ //
+ int i = 0;
+ while(i < args.length)
+ {
+ if(args[i].equals("--dbdir"))
+ {
+ if(i +1 >= args.length)
+ {
+ usage(progName);
+ System.exit(1);
+ }
+
+ envName = args[i+1];
+ envName += "/";
+ envName += "db";
+
+ //
+ // Consume arguments
+ //
+ String[] arr = new String[args.length - 2];
+ System.arraycopy(args, 0, arr, 0, i);
+ if(i < args.length - 2)
+ {
+ System.arraycopy(args, i + 2, arr, i, args.length - i - 2);
+ }
+ args = arr;
+ }
+ else
+ {
+ ++i;
+ }
+ }
+
+ Ice.StringSeqHolder holder = new Ice.StringSeqHolder();
+ holder.value = args;
+ communicator = Ice.Util.initialize(holder);
+ args = holder.value;
+ Client client = new Client(communicator, envName);
+ try
+ {
+ status = client.run(args, "test");
+ }
+ finally
+ {
+ client.close();
+ }
+ }
+ catch(Exception ex)
+ {
+ ex.printStackTrace();
+ System.err.println(ex);
+ status = 1;
+ }
+
+ if(communicator != null)
+ {
+ try
+ {
+ communicator.destroy();
+ }
+ catch(Exception ex)
+ {
+ System.err.println(ex);
+ status = 1;
+ }
+ }
+
+ System.gc();
+ System.exit(status);
}
private Ice.Communicator _communicator;
diff --git a/java/test/Freeze/complex/Complex/AddNodeI.java b/java/test/Freeze/complex/Complex/AddNodeI.java
index 80f58f00fd5..0345fe740b4 100644
--- a/java/test/Freeze/complex/Complex/AddNodeI.java
+++ b/java/test/Freeze/complex/Complex/AddNodeI.java
@@ -19,13 +19,13 @@ public class AddNodeI extends AddNode
public
AddNodeI(Node left, Node right)
{
- this.left = left;
- this.right = right;
+ this.left = left;
+ this.right = right;
}
public int
calc(Ice.Current current)
{
- return left.calc(current) + right.calc(current);
+ return left.calc(current) + right.calc(current);
}
}
diff --git a/java/test/Freeze/complex/Complex/MultiplyNodeI.java b/java/test/Freeze/complex/Complex/MultiplyNodeI.java
index a69d45a6ae4..2f5ea93a466 100644
--- a/java/test/Freeze/complex/Complex/MultiplyNodeI.java
+++ b/java/test/Freeze/complex/Complex/MultiplyNodeI.java
@@ -19,13 +19,13 @@ public class MultiplyNodeI extends MultiplyNode
public
MultiplyNodeI(Node left, Node right)
{
- this.left = left;
- this.right = right;
+ this.left = left;
+ this.right = right;
}
public int
calc(Ice.Current current)
{
- return left.calc(current) * right.calc(current);
+ return left.calc(current) * right.calc(current);
}
}
diff --git a/java/test/Freeze/complex/Complex/NumberNodeI.java b/java/test/Freeze/complex/Complex/NumberNodeI.java
index 1b0ffd6cd97..4faec76deef 100644
--- a/java/test/Freeze/complex/Complex/NumberNodeI.java
+++ b/java/test/Freeze/complex/Complex/NumberNodeI.java
@@ -19,12 +19,12 @@ public class NumberNodeI extends NumberNode
public
NumberNodeI(int number)
{
- this.number = number;
+ this.number = number;
}
public int
calc(Ice.Current current)
{
- return number;
+ return number;
}
}
diff --git a/java/test/Freeze/complex/Complex/ObjectFactoryI.java b/java/test/Freeze/complex/Complex/ObjectFactoryI.java
index 1684152ee73..32fe08f7c9b 100644
--- a/java/test/Freeze/complex/Complex/ObjectFactoryI.java
+++ b/java/test/Freeze/complex/Complex/ObjectFactoryI.java
@@ -14,27 +14,27 @@ public class ObjectFactoryI extends Ice.LocalObjectImpl implements Ice.ObjectFac
public Ice.Object
create(String type)
{
- if(type.equals("::Complex::MultiplyNode"))
- {
- return new MultiplyNodeI();
- }
- if(type.equals("::Complex::AddNode"))
- {
- return new AddNodeI();
- }
+ if(type.equals("::Complex::MultiplyNode"))
+ {
+ return new MultiplyNodeI();
+ }
+ if(type.equals("::Complex::AddNode"))
+ {
+ return new AddNodeI();
+ }
if(type.equals("::Complex::NumberNode"))
- {
- return new NumberNodeI();
- }
+ {
+ return new NumberNodeI();
+ }
- System.err.println( "create: " + type);
- assert(false);
- return null;
+ System.err.println( "create: " + type);
+ assert(false);
+ return null;
}
public void
destroy()
{
- // Nothing to do
+ // Nothing to do
}
}
diff --git a/java/test/Freeze/complex/ParseError.java b/java/test/Freeze/complex/ParseError.java
index 2be50466196..6cd2757f16d 100644
--- a/java/test/Freeze/complex/ParseError.java
+++ b/java/test/Freeze/complex/ParseError.java
@@ -11,6 +11,6 @@ public class ParseError extends Exception
{
public ParseError(String msg)
{
- super(msg);
+ super(msg);
}
}
diff --git a/java/test/Freeze/complex/Parser.java b/java/test/Freeze/complex/Parser.java
index 2fed6eed723..99a1865574d 100644
--- a/java/test/Freeze/complex/Parser.java
+++ b/java/test/Freeze/complex/Parser.java
@@ -11,150 +11,150 @@ public class Parser
{
public Complex.Node
parse(String buf)
- throws ParseError
+ throws ParseError
{
- _buf = buf;
- _pos = 0;
- _token = null;
+ _buf = buf;
+ _pos = 0;
+ _token = null;
- return start();
+ return start();
}
private Complex.Node
start()
- throws ParseError
+ throws ParseError
{
- nextToken();
- Complex.Node node = expr();
- if(_token != null)
- {
- throw new ParseError("Extra garbage: " + _token);
- }
- return node;
+ nextToken();
+ Complex.Node node = expr();
+ if(_token != null)
+ {
+ throw new ParseError("Extra garbage: " + _token);
+ }
+ return node;
}
private Complex.Node
expr()
- throws ParseError
+ throws ParseError
{
- try
- {
- if(_token == null)
- {
- return null;
- }
+ try
+ {
+ if(_token == null)
+ {
+ return null;
+ }
- //
- // '(' expr ')'
- //
- if(_token.charAt(0) == '(')
- {
- nextToken();
+ //
+ // '(' expr ')'
+ //
+ if(_token.charAt(0) == '(')
+ {
+ nextToken();
- Complex.Node node = expr();
- if(_token.charAt(0) != ')')
- {
- throw new ParseError("Expected ')'");
- }
+ Complex.Node node = expr();
+ if(_token.charAt(0) != ')')
+ {
+ throw new ParseError("Expected ')'");
+ }
- nextToken();
- return node;
- }
+ nextToken();
+ return node;
+ }
- //
- // expr | expr '+' expr | expr '*' expr
- //
- if(!Character.isDigit(_token.charAt(0)))
- {
- throw new ParseError("Expected number");
- }
-
- Complex.NumberNode number = new Complex.NumberNodeI(Integer.parseInt(_token));
- Complex.Node result = number;
-
- //
- // expr?
- //
- nextToken();
- if(_token != null)
- {
- //
- // expr '+' expr
- //
- if(_token.charAt(0) == '+')
- {
- nextToken();
- Complex.Node right = expr();
- result = new Complex.AddNodeI(number, right);
- }
-
- //
- // expr '*' expr
- //
- else if(_token.charAt(0) == '*')
- {
- nextToken();
- Complex.Node right = expr();
- result = new Complex.MultiplyNodeI(number, right);
- }
- }
- return result;
- }
- catch(NumberFormatException e)
- {
- ParseError ex = new ParseError("Error parsing number");
- ex.initCause(e);
- throw ex;
- }
+ //
+ // expr | expr '+' expr | expr '*' expr
+ //
+ if(!Character.isDigit(_token.charAt(0)))
+ {
+ throw new ParseError("Expected number");
+ }
+
+ Complex.NumberNode number = new Complex.NumberNodeI(Integer.parseInt(_token));
+ Complex.Node result = number;
+
+ //
+ // expr?
+ //
+ nextToken();
+ if(_token != null)
+ {
+ //
+ // expr '+' expr
+ //
+ if(_token.charAt(0) == '+')
+ {
+ nextToken();
+ Complex.Node right = expr();
+ result = new Complex.AddNodeI(number, right);
+ }
+
+ //
+ // expr '*' expr
+ //
+ else if(_token.charAt(0) == '*')
+ {
+ nextToken();
+ Complex.Node right = expr();
+ result = new Complex.MultiplyNodeI(number, right);
+ }
+ }
+ return result;
+ }
+ catch(NumberFormatException e)
+ {
+ ParseError ex = new ParseError("Error parsing number");
+ ex.initCause(e);
+ throw ex;
+ }
}
private void
nextToken()
{
- //
- // Eat any whitespace.
- //
- while(_pos < _buf.length() && Character.isWhitespace(_buf.charAt(_pos)))
- {
- _pos++;
- }
+ //
+ // Eat any whitespace.
+ //
+ while(_pos < _buf.length() && Character.isWhitespace(_buf.charAt(_pos)))
+ {
+ _pos++;
+ }
- //
- // At the end-of-buffer?
- //
- if(_pos >= _buf.length())
- {
- _token = null;
- return;
- }
+ //
+ // At the end-of-buffer?
+ //
+ if(_pos >= _buf.length())
+ {
+ _token = null;
+ return;
+ }
- StringBuffer buf = new StringBuffer();
-
- //
- // Get the next character
- //
- char c = _buf.charAt(_pos);
-
- //
- // '(', ')', '+' and '*' are tokens.
- //
- if(c == '(' || c == ')' || c == '+' || c == '*')
- {
- buf.append(c);
- ++_pos;
- }
- else
- {
- //
- // Otherwise it's a number.
- //
- while(_pos < _buf.length() && Character.isDigit(_buf.charAt(_pos)))
- {
- buf.append(_buf.charAt(_pos++));
- }
- }
-
- _token = buf.toString();
+ StringBuffer buf = new StringBuffer();
+
+ //
+ // Get the next character
+ //
+ char c = _buf.charAt(_pos);
+
+ //
+ // '(', ')', '+' and '*' are tokens.
+ //
+ if(c == '(' || c == ')' || c == '+' || c == '*')
+ {
+ buf.append(c);
+ ++_pos;
+ }
+ else
+ {
+ //
+ // Otherwise it's a number.
+ //
+ while(_pos < _buf.length() && Character.isDigit(_buf.charAt(_pos)))
+ {
+ buf.append(_buf.charAt(_pos++));
+ }
+ }
+
+ _token = buf.toString();
}
private String _buf;