|
| From: | Michael Hitchcock |
| Subject: | [nrdo-list] file changes |
| Date: | Wed, 22 Mar 2006 15:49:20 -0600 |
|
Stuart, Here are the file changes I made per our discussions…. Index: doc/tutorial.txt =================================================================== RCS file: /sources/nrdo/nrdo/doc/tutorial.txt,v retrieving revision 1.3 diff -u -r1.3 tutorial.txt --- doc/tutorial.txt 13 May 2003 17:20:54
-0000 1.3 +++ doc/tutorial.txt 22 Mar 2006 21:23:11
-0000 @@ -20,21 +20,25 @@ In this setup, amhr.nrdo might contain the following: config { - strings { - copyright [Copyright (c) Year of the
Fruitbat Ankh-Morpork City Gov.]; - }; - pkgbase [dw.gov.ankhmorpork]; - srcbase [gen-src]; - dfnbase [dfns]; - cachebase [cache]; - cgltemplate [../nrdo/templates/java.cgl]; - schema [amhr]; - dbdriver [oracle.jdbc.driver.OracleDriver]; - dburl
[jdbc:oracle:thin:@dbserver.ankhmorpork.gov.dw:1521:amdb]; - dbuser [amhr]; - dbpasswd [mightydeeps]; + dfnbase [dfns]; + cachebase [cache]; + dburl
[jdbc:microsoft:sqlserver://<server>:1433;User=<user>;Password=<passw ord>;database=<db>]; + global { + set nsbase
[amhr]; + set copyright
[Copyright (c) 2006 TMLLC]; + set nrdopath
..\..\..\nrdo; # or the right number of ..'s to get from y our srcbase folder to the nrdo folder + set
vstudioversion 2005; + }; + stampfile amhr.nrdo.stamp; # optional but
combined with other tricks can ma ke it run faster + srcbase [gen-src]; # must be a folder
that exists, where generated code wil l be placed + cgltemplate
[..\nrdo\templates\csharp2.cgl]; + querytemplate
[..\nrdo\templates\csharp2-query.cgl]; + dbadapter [mssqlserver]; + dbdriver
[com.microsoft.jdbc.sqlserver.SQLServerDriver, mssqljdbc]; + promptcmd cscript /nologo
[..\nrdo\tools\prompt.vbs]; }; + Note: if more than one developer will be working on
the project simultaneously, you really need to read config-syntax.txt to figure
out the optimal place for the cache(s). cvs diff: Diffing src cvs diff: Diffing src/gnu cvs diff: Diffing src/gnu/text cvs diff: Diffing src/net cvs diff: Diffing src/net/netreach cvs diff: Diffing src/net/netreach/cgl Index: src/net/netreach/cgl/CGLParser.java =================================================================== RCS file:
/sources/nrdo/nrdo/src/net/netreach/cgl/CGLParser.java,v retrieving revision 1.13 diff -u -r1.13 CGLParser.java --- src/net/netreach/cgl/CGLParser.java 19 Nov 2003 14:12:49
-0000 1.13 +++ src/net/netreach/cgl/CGLParser.java 22 Mar 2006 21:23:11
-0000 @@ -323,7 +323,7 @@
res = new InitCap(parseAction(pctx, sr)); } else if
("intercap".equals(keyword)) { - res
= new InterCap(sr.skipString(), parseAction(pctx, sr)); + res
= new InterCap(new Range(sr), sr.skipString(), parseAction(pctx, sr)); } else if
("eq".equals(keyword)) {
res = new Eq(parseExpr(pctx, sr), parseExpr(pctx, sr)); Index: src/net/netreach/cgl/InterCap.java =================================================================== RCS file:
/sources/nrdo/nrdo/src/net/netreach/cgl/InterCap.java,v retrieving revision 1.2 diff -u -r1.2 InterCap.java --- src/net/netreach/cgl/InterCap.java 28 Aug 2001
15:16:20 -0000 1.2 +++ src/net/netreach/cgl/InterCap.java 22 Mar 2006
21:23:11 -0000 @@ -46,13 +46,14 @@ // I/O classes used. import java.io.IOException; import net.netreach.smelt.SmeltException; +import net.netreach.smelt.Range; -class InterCap extends Expr { +class InterCap extends PositionedExpr { String chars; Expr value; public Object evaluate(Context ctx) throws
SmeltException, IOException { Object result =
value.evaluate(ctx); - if (result == null) throw new
NullPointerException("Illegal use of null"); + if (result == null) throw new
CGLException(this, "Illegal use of null"); String s = result.toString(); StringBuffer sb = new
StringBuffer(s.length()); for (int i = 0; i < s.length();
i++) { @@ -65,7 +66,8 @@ } return sb.toString(); } - InterCap(String chars, Expr value) { + InterCap(Range range, String chars, Expr value) { + super(range); this.chars = chars; this.value = value; } cvs diff: Diffing src/net/netreach/nrdo cvs diff: Diffing src/net/netreach/nrdo/tools Index: src/net/netreach/nrdo/tools/TableDef.java =================================================================== RCS file:
/sources/nrdo/nrdo/src/net/netreach/nrdo/tools/TableDef.java,v retrieving revision 1.59 diff -u -r1.59 TableDef.java --- src/net/netreach/nrdo/tools/TableDef.java 30
Nov 2005 02:30:33 -0000 1.59 +++ src/net/netreach/nrdo/tools/TableDef.java 22
Mar 2006 21:23:12 -0000 @@ -280,12 +280,12 @@ } public static class OrderByClause implements
Mappable { - private Field field; + private TableDef.Field field; private String rawSql; private List sql; private boolean descending; - public OrderByClause(Field field,
boolean descending) { + public OrderByClause(TableDef.Field
field, boolean descending) { this.field = field; this.descending =
descending; } @@ -306,7 +306,7 @@ return
field.equals(clause.field); } } - public void resolve(Get get) throws
SmeltException, IOException { + public void resolve(TableDef.Get get)
throws SmeltException, IOException { if (rawSql != null) sql
= get.scanParams(rawSql); } public void checkOnlyOne() { cvs diff: Diffing src/net/netreach/nrtl cvs diff: Diffing src/net/netreach/nrtl/controls cvs diff: Diffing src/net/netreach/smelt cvs diff: Diffing src/net/netreach/util cvs diff: Diffing src/net/netreach/util/misc cvs diff: Diffing syntax cvs diff: Diffing syntax/vim cvs diff: Diffing templates cvs diff: Diffing tests cvs diff: Diffing tests/expected cvs diff: Diffing tests/failures cvs diff: Diffing tests/tests cvs diff: Diffing tools Index: tools/nrdocompile.bat =================================================================== Michael S. Hitchcock |
| [Prev in Thread] | Current Thread | [Next in Thread] |