Merge

30 files changed, 15 insertions, 0 deletions

diff --git a/RGens/src/main/java/.DS_Store b/RGens/src/main/java/.DS_Store
index c5a38b7..c5a38b7 100644..100755
--- a/RGens/src/main/java/.DS_Store
+++ b/RGens/src/main/java/.DS_Store
diff --git a/RGens/src/main/java/bjc/.DS_Store b/RGens/src/main/java/bjc/.DS_Store
index 86e50e6..86e50e6 100644..100755
--- a/RGens/src/main/java/bjc/.DS_Store
+++ b/RGens/src/main/java/bjc/.DS_Store
diff --git a/RGens/src/main/java/bjc/rgens/ZadronsPouch.java b/RGens/src/main/java/bjc/rgens/ZadronsPouch.java
index 827d022..827d022 100644..100755
--- a/RGens/src/main/java/bjc/rgens/ZadronsPouch.java
+++ b/RGens/src/main/java/bjc/rgens/ZadronsPouch.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/GrammarException.java b/RGens/src/main/java/bjc/rgens/parser/GrammarException.java
index 9eaa0a1..9eaa0a1 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/GrammarException.java
+++ b/RGens/src/main/java/bjc/rgens/parser/GrammarException.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/RGrammar.java b/RGens/src/main/java/bjc/rgens/parser/RGrammar.java
index 38f38c8..38f38c8 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/RGrammar.java
+++ b/RGens/src/main/java/bjc/rgens/parser/RGrammar.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/RGrammarBuilder.java b/RGens/src/main/java/bjc/rgens/parser/RGrammarBuilder.java
index b4cb04a..b4cb04a 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/RGrammarBuilder.java
+++ b/RGens/src/main/java/bjc/rgens/parser/RGrammarBuilder.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/RGrammarFormatter.java b/RGens/src/main/java/bjc/rgens/parser/RGrammarFormatter.java
index a2454dc..a2454dc 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/RGrammarFormatter.java
+++ b/RGens/src/main/java/bjc/rgens/parser/RGrammarFormatter.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/RGrammarParser.java b/RGens/src/main/java/bjc/rgens/parser/RGrammarParser.java
index 3a357b1..3a357b1 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/RGrammarParser.java
+++ b/RGens/src/main/java/bjc/rgens/parser/RGrammarParser.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/RGrammarSet.java b/RGens/src/main/java/bjc/rgens/parser/RGrammarSet.java
index 975510a..975510a 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/RGrammarSet.java
+++ b/RGens/src/main/java/bjc/rgens/parser/RGrammarSet.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/RGrammarTest.java b/RGens/src/main/java/bjc/rgens/parser/RGrammarTest.java
index 4b1f283..4b1f283 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/RGrammarTest.java
+++ b/RGens/src/main/java/bjc/rgens/parser/RGrammarTest.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/RGrammars.java b/RGens/src/main/java/bjc/rgens/parser/RGrammars.java
index f74a756..f74a756 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/RGrammars.java
+++ b/RGens/src/main/java/bjc/rgens/parser/RGrammars.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/RegexRuleCase.java b/RGens/src/main/java/bjc/rgens/parser/RegexRuleCase.java
index 5e03cd6..5e03cd6 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/RegexRuleCase.java
+++ b/RGens/src/main/java/bjc/rgens/parser/RegexRuleCase.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/Rule.java b/RGens/src/main/java/bjc/rgens/parser/Rule.java
index 7043e0f..7043e0f 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/Rule.java
+++ b/RGens/src/main/java/bjc/rgens/parser/Rule.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/RuleCase.java b/RGens/src/main/java/bjc/rgens/parser/RuleCase.java
index 9c0a856..9c0a856 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/RuleCase.java
+++ b/RGens/src/main/java/bjc/rgens/parser/RuleCase.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/elements/BlankCaseElement.java b/RGens/src/main/java/bjc/rgens/parser/elements/BlankCaseElement.java
index 7229e92..7229e92 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/elements/BlankCaseElement.java
+++ b/RGens/src/main/java/bjc/rgens/parser/elements/BlankCaseElement.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/elements/CaseElement.java b/RGens/src/main/java/bjc/rgens/parser/elements/CaseElement.java
index d74ab52..d74ab52 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/elements/CaseElement.java
+++ b/RGens/src/main/java/bjc/rgens/parser/elements/CaseElement.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/elements/ExpVariableCaseElement.java b/RGens/src/main/java/bjc/rgens/parser/elements/ExpVariableCaseElement.java
index 30925e2..30925e2 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/elements/ExpVariableCaseElement.java
+++ b/RGens/src/main/java/bjc/rgens/parser/elements/ExpVariableCaseElement.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/elements/LitVariableCaseElement.java b/RGens/src/main/java/bjc/rgens/parser/elements/LitVariableCaseElement.java
index 11035b1..11035b1 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/elements/LitVariableCaseElement.java
+++ b/RGens/src/main/java/bjc/rgens/parser/elements/LitVariableCaseElement.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/elements/LiteralCaseElement.java b/RGens/src/main/java/bjc/rgens/parser/elements/LiteralCaseElement.java
index d96a32d..d96a32d 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/elements/LiteralCaseElement.java
+++ b/RGens/src/main/java/bjc/rgens/parser/elements/LiteralCaseElement.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/elements/RangeCaseElement.java b/RGens/src/main/java/bjc/rgens/parser/elements/RangeCaseElement.java
index d98bc61..d98bc61 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/elements/RangeCaseElement.java
+++ b/RGens/src/main/java/bjc/rgens/parser/elements/RangeCaseElement.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/elements/RuleCaseElement.java b/RGens/src/main/java/bjc/rgens/parser/elements/RuleCaseElement.java
index f4d3512..f4d3512 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/elements/RuleCaseElement.java
+++ b/RGens/src/main/java/bjc/rgens/parser/elements/RuleCaseElement.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/elements/StringCaseElement.java b/RGens/src/main/java/bjc/rgens/parser/elements/StringCaseElement.java
index 0e64fd3..0e64fd3 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/elements/StringCaseElement.java
+++ b/RGens/src/main/java/bjc/rgens/parser/elements/StringCaseElement.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/elements/VariableCaseElement.java b/RGens/src/main/java/bjc/rgens/parser/elements/VariableCaseElement.java
index 920445a..920445a 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/elements/VariableCaseElement.java
+++ b/RGens/src/main/java/bjc/rgens/parser/elements/VariableCaseElement.java
diff --git a/RGens/src/main/java/bjc/rgens/parser/new-syntax.txt b/RGens/src/main/java/bjc/rgens/parser/new-syntax.txt
index f6578b4..f6578b4 100644..100755
--- a/RGens/src/main/java/bjc/rgens/parser/new-syntax.txt
+++ b/RGens/src/main/java/bjc/rgens/parser/new-syntax.txt
diff --git a/RGens/src/main/java/bjc/rgens/text/markov/Markov.java b/RGens/src/main/java/bjc/rgens/text/markov/Markov.java
index e21d60f..e21d60f 100644..100755
--- a/RGens/src/main/java/bjc/rgens/text/markov/Markov.java
+++ b/RGens/src/main/java/bjc/rgens/text/markov/Markov.java
diff --git a/RGens/src/main/java/bjc/rgens/text/markov/StandaloneMarkov.java b/RGens/src/main/java/bjc/rgens/text/markov/StandaloneMarkov.java
index cebf2bc..cebf2bc 100644..100755
--- a/RGens/src/main/java/bjc/rgens/text/markov/StandaloneMarkov.java
+++ b/RGens/src/main/java/bjc/rgens/text/markov/StandaloneMarkov.java
diff --git a/RGens/src/main/java/bjc/rgens/text/markov/StandaloneTextGenerator.java b/RGens/src/main/java/bjc/rgens/text/markov/StandaloneTextGenerator.java
index 339e8d5..339e8d5 100644..100755
--- a/RGens/src/main/java/bjc/rgens/text/markov/StandaloneTextGenerator.java
+++ b/RGens/src/main/java/bjc/rgens/text/markov/StandaloneTextGenerator.java
diff --git a/RGens/src/main/java/bjc/rgens/text/markov/TextGenerator.java b/RGens/src/main/java/bjc/rgens/text/markov/TextGenerator.java
index f629d49..f629d49 100644..100755
--- a/RGens/src/main/java/bjc/rgens/text/markov/TextGenerator.java
+++ b/RGens/src/main/java/bjc/rgens/text/markov/TextGenerator.java
diff --git a/RGens/src/main/sql/db_schema.sql b/RGens/src/main/sql/db_schema.sql
index 553c7a8..553c7a8 100644..100755
--- a/RGens/src/main/sql/db_schema.sql
+++ b/RGens/src/main/sql/db_schema.sql
diff --git a/RGens/src/main/sql/db_schema.sql.orig b/RGens/src/main/sql/db_schema.sql.orig
new file mode 100755
index 0000000..10df3f0
--- /dev/null
+++ b/RGens/src/main/sql/db_schema.sql.orig
@@ -0,0 +1,15 @@
+create table Rules (
+	ruleid serial,
+	name varchar(255) not null,
+	casecount int,
+	primary key(id)
+);
+
+create index Rules_name on Rules(name);
+
+create table RuleCases (
+	ruleid serial,
+	cse varchar(255) array
+);
+
+create index RuleCase_id on RuleCases(ruleid);