bprocessor-commit Mailing List for B-processor (Page 102)
Status: Pre-Alpha
Brought to you by:
henryml
Menu
▾
▴
bprocessor-commit — Commit
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(12) |
Jul
(117) |
Aug
(151) |
Sep
(157) |
Oct
(81) |
Nov
(117) |
Dec
(119) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(183) |
Feb
(130) |
Mar
(117) |
Apr
(61) |
May
(82) |
Jun
(45) |
Jul
(149) |
Aug
(173) |
Sep
(199) |
Oct
(165) |
Nov
(107) |
Dec
(137) |
| 2007 |
Jan
(124) |
Feb
(58) |
Mar
(123) |
Apr
(80) |
May
(130) |
Jun
(64) |
Jul
(31) |
Aug
(42) |
Sep
(114) |
Oct
(167) |
Nov
(239) |
Dec
(200) |
| 2008 |
Jan
(43) |
Feb
(43) |
Mar
(4) |
Apr
(9) |
May
(5) |
Jun
(1) |
Jul
(3) |
Aug
(3) |
Sep
(13) |
Oct
(9) |
Nov
(12) |
Dec
|
| 2009 |
Jan
|
Feb
(20) |
Mar
(7) |
Apr
(12) |
May
(34) |
Jun
(72) |
Jul
|
Aug
(3) |
Sep
(31) |
Oct
(2) |
Nov
(8) |
Dec
(4) |
| 2010 |
Jan
(5) |
Feb
(32) |
Mar
(8) |
Apr
(7) |
May
(36) |
Jun
|
Jul
(11) |
Aug
(15) |
Sep
(7) |
Oct
(2) |
Nov
(13) |
Dec
(80) |
| 2011 |
Jan
|
Feb
|
Mar
(8) |
Apr
(12) |
May
(32) |
Jun
(9) |
Jul
(5) |
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
(8) |
| 2012 |
Jan
|
Feb
|
Mar
(3) |
Apr
(5) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(22) |
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Michael L. <he...@us...> - 2006-09-15 12:06:44
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20828/src/net/sourceforge/bprocessor/gl/view Modified Files: View.java Log Message: Transform implemented Index: View.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v retrieving revision 1.147 retrieving revision 1.148 diff -C2 -d -r1.147 -r1.148 *** View.java 30 Aug 2006 09:53:09 -0000 1.147 --- View.java 15 Sep 2006 12:06:42 -0000 1.148 *************** *** 29,32 **** --- 29,33 ---- import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Entity; + import net.sourceforge.bprocessor.model.Transform; import java.util.ArrayList; *************** *** 994,997 **** --- 995,1009 ---- private void drawSpace(Space space, GLDrawable gld) { + Transform t = space.getTransform(); + + gl.glPushMatrix(); + + if (t != null) { + gl.glTranslated(t.tx(), t.ty(), t.tz()); + gl.glRotated(t.rx(), 1, 0, 0); + gl.glRotated(t.ry(), 0, 1, 0); + gl.glRotated(t.rz(), 0, 0, 1); + } + Collection surfaces = space.getSurfaces(); switch (drawMode) { *************** *** 1037,1040 **** --- 1049,1053 ---- drawSpace(current, gld); } + gl.glPopMatrix(); } |
|
From: Michael L. <he...@us...> - 2006-09-15 12:06:40
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20819/src/net/sourceforge/bprocessor/model Modified Files: Space.java Transform.java Log Message: Transform implemented Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** Space.java 15 Sep 2006 07:31:47 -0000 1.60 --- Space.java 15 Sep 2006 12:06:38 -0000 1.61 *************** *** 100,103 **** --- 100,106 ---- private boolean transparent; + /** The transformation */ + private Transform transform; + /** The construcstionspace classification options */ private String[] constructionOptions = *************** *** 203,206 **** --- 206,225 ---- type = value; } + + /** + * Get transformation + * @return transformation + */ + public Transform getTransform() { + return transform; + } + + /** + * Set transformation + * @param transform Transform + */ + public void setTransform(Transform transform) { + this.transform = transform; + } /** *************** *** 1147,1150 **** --- 1166,1172 ---- } } + if (getTransform() != null) { + res.add(new Attribute("Transform", getTransform())); + } return res; } Index: Transform.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Transform.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Transform.java 15 Sep 2006 07:31:47 -0000 1.1 --- Transform.java 15 Sep 2006 12:06:38 -0000 1.2 *************** *** 213,217 **** sz(((Double)a.getValue()).doubleValue()); } ! } } --- 213,218 ---- sz(((Double)a.getValue()).doubleValue()); } ! } ! Project.getInstance().changed(Project.getInstance()); } |
|
From: Michael L. <he...@us...> - 2006-09-15 12:06:38
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20811/src/net/sourceforge/bprocessor/gui/treeview Modified Files: GenericTreeView.java Log Message: Transform implemented Index: GenericTreeView.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/treeview/GenericTreeView.java,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** GenericTreeView.java 11 Sep 2006 14:03:45 -0000 1.41 --- GenericTreeView.java 15 Sep 2006 12:06:34 -0000 1.42 *************** *** 52,55 **** --- 52,56 ---- import net.sourceforge.bprocessor.model.Space; import net.sourceforge.bprocessor.model.Surface; + import net.sourceforge.bprocessor.model.Transform; import net.sourceforge.bprocessor.model.Vertex; import net.sourceforge.bprocessor.model.Geometry; *************** *** 556,559 **** --- 557,568 ---- }; pm.add(check); + AbstractAction transform = new EntityAction((Entity) object, "Transform") { + public void actionPerformed(ActionEvent arg0) { + Space space = (Space) entity; + space.setTransform(new Transform()); + space.changed(); + } + }; + pm.add(transform); // Adding all modellors |
|
From: Michael L. <he...@us...> - 2006-09-15 07:31:50
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13457/src/net/sourceforge/bprocessor/model Modified Files: Space.java Added Files: Transform.java Log Message: Improvement of scripting Added a transform Index: Space.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** Space.java 11 Sep 2006 09:24:52 -0000 1.59 --- Space.java 15 Sep 2006 07:31:47 -0000 1.60 *************** *** 1137,1148 **** res.add(new Attribute("Description", getDescription())); if (getModellor() != null) { ! List attributes = getModellor().getAttributes(); ! res.addAll(attributes); } if (getOwner().getModellor() != null) { Parametric parameters = getOwner().getModellor().get(this); if (parameters != null) { ! List attributes = parameters.getAttributes(); ! res.addAll(attributes); } } --- 1137,1148 ---- res.add(new Attribute("Description", getDescription())); if (getModellor() != null) { ! res.add(new Attribute("Modellor", getModellor())); } if (getOwner().getModellor() != null) { + Project.info("owner has modellor"); Parametric parameters = getOwner().getModellor().get(this); if (parameters != null) { ! Project.info("owner has parameters"); ! res.add(new Attribute(parameters.getGeneralName(), parameters)); } } --- NEW FILE: Transform.java --- //--------------------------------------------------------------------------------- // $Id: Transform.java,v 1.1 2006/09/15 07:31:47 henryml Exp $ // // Copyright (c) 2005 The BProcessor Team (http://bprocessor.sourceforge.net) // Released under the Lesser GNU Public License v2.1 //--------------------------------------------------------------------------------- package net.sourceforge.bprocessor.model; import java.util.ArrayList; import java.util.Iterator; import java.util.List; /** * Transform */ public class Transform implements Parametric { /** translate x */ private double tx; /** translate y */ private double ty; /** translate z */ private double tz; /** rotate x */ private double rx; /** rotate y */ private double ry; /** rotate z */ private double rz; /** scale x */ private double sx; /** scale y */ private double sy; /** scale z */ private double sz; /** * Constructor */ public Transform() { super(); tx = 0; ty = 0; tz = 0; rx = 0; ry = 0; rz = 0; sx = 1; sy = 1; sz = 1; } /** * @param value new value */ public void tx(double value) { tx = value; } /** * * @return tx */ public double tx() { return tx; } /** * @param value new value */ public void ty(double value) { ty = value; } /** * * @return ty */ public double ty() { return ty; } /** * @param value new value */ public void tz(double value) { tz = value; } /** * * @return tz */ public double tz() { return tz; } /** * @param value new value */ public void rx(double value) { rx = value; } /** * * @return rx */ public double rx() { return rx; } /** * @param value new value */ public void ry(double value) { ry = value; } /** * * @return ry */ public double ry() { return ry; } /** * @param value new value */ public void rz(double value) { rz = value; } /** * * @return rz */ public double rz() { return rz; } /** * @param value new value */ public void sx(double value) { sx = value; } /** * * @return sx */ public double sx() { return sx; } /** * @param value new value */ public void sy(double value) { sy = value; } /** * * @return sy */ public double sy() { return sy; } /** * @param value new value */ public void sz(double value) { sz = value; } /** * * @return sz */ public double sz() { return sz; } /** * Set attributes * @param attributes List */ public void setAttributes(List attributes) { Iterator iter = attributes.iterator(); while (iter.hasNext()) { Attribute a = (Attribute)iter.next(); if (a.getName().equals("Translate X")) { tx(((Double)a.getValue()).doubleValue()); } else if (a.getName().equals("Translate Y")) { ty(((Double)a.getValue()).doubleValue()); } else if (a.getName().equals("Translate Z")) { tz(((Double)a.getValue()).doubleValue()); } else if (a.getName().equals("Rotate X")) { rx(((Double)a.getValue()).doubleValue()); } else if (a.getName().equals("Rotate Y")) { ry(((Double)a.getValue()).doubleValue()); } else if (a.getName().equals("Rotate Z")) { rz(((Double)a.getValue()).doubleValue()); } else if (a.getName().equals("Scale X")) { sx(((Double)a.getValue()).doubleValue()); } else if (a.getName().equals("Scale Y")) { sy(((Double)a.getValue()).doubleValue()); } else if (a.getName().equals("Scale Z")) { sz(((Double)a.getValue()).doubleValue()); } } } /** * Get attributes * @return List */ public List getAttributes() { ArrayList res = new ArrayList(); res.add(new Attribute("Translate X", new Double(tx()))); res.add(new Attribute("Translate Y", new Double(ty()))); res.add(new Attribute("Translate Z", new Double(tz()))); res.add(new Attribute("Rotate X", new Double(rx()))); res.add(new Attribute("Rotate Y", new Double(ry()))); res.add(new Attribute("Rotate Z", new Double(rz()))); res.add(new Attribute("Scale X", new Double(sx()))); res.add(new Attribute("Scale Y", new Double(sy()))); res.add(new Attribute("Scale Z", new Double(sz()))); return res; } /** * Get display name * @return name */ public String getGeneralName() { return "Transform"; } } |
|
From: Michael L. <he...@us...> - 2006-09-15 07:31:45
|
Update of /cvsroot/bprocessor/bscript/lib In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13439/lib Modified Files: model.jar Log Message: Improvement of scripting Added a transform Index: model.jar =================================================================== RCS file: /cvsroot/bprocessor/bscript/lib/model.jar,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvsqHgyu6 and /tmp/cvsjdMp1x differ |
|
From: Michael L. <he...@us...> - 2006-09-15 07:31:33
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13417/src/net/sourceforge/bprocessor/gui/attrview Modified Files: GenericPanel.java Log Message: Improvement of scripting Added a transform Index: GenericPanel.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/attrview/GenericPanel.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** GenericPanel.java 17 Jul 2006 08:32:00 -0000 1.19 --- GenericPanel.java 15 Sep 2006 07:31:23 -0000 1.20 *************** *** 141,145 **** }); where.add(new AttributeRow(da)); ! } else if (a.getValue() instanceof Entity) { // Handles the links LinkAttribute la = new LinkAttribute(a); --- 141,145 ---- }); where.add(new AttributeRow(da)); ! } else if (a.getValue() instanceof Parametric) { // Handles the links LinkAttribute la = new LinkAttribute(a); |
|
From: Michael L. <he...@us...> - 2006-09-15 07:31:31
|
Update of /cvsroot/bprocessor/facade/dist In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13432/dist Added Files: facade.jar Log Message: Improvement of scripting Added a transform --- NEW FILE: facade.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Michael L. <he...@us...> - 2006-09-14 13:38:12
|
Update of /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5331/src/net/sourceforge/bprocessor/gui/actions Modified Files: CreateConstructionSpaceActionListener.java Log Message: Improved scripting Index: CreateConstructionSpaceActionListener.java =================================================================== RCS file: /cvsroot/bprocessor/gui/src/net/sourceforge/bprocessor/gui/actions/CreateConstructionSpaceActionListener.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CreateConstructionSpaceActionListener.java 24 Jan 2006 14:10:36 -0000 1.8 --- CreateConstructionSpaceActionListener.java 14 Sep 2006 13:38:02 -0000 1.9 *************** *** 45,49 **** if (result != null && !result.trim().equals("")) { Space cs = Space.createConstructionSpace(result.trim()); ! Project.getInstance().add(cs); } } --- 45,51 ---- if (result != null && !result.trim().equals("")) { Space cs = Space.createConstructionSpace(result.trim()); ! Project.getInstance().getActiveSpace().add(cs); ! Project.getInstance().changed(Project.getInstance()); ! Project.getInstance().checkpoint(); } } |
|
From: Michael L. <he...@us...> - 2006-09-14 09:21:54
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31082/src/net/sourceforge/bprocessor/gl/tool Modified Files: SpaceTool.java Log Message: Improved scripting Index: SpaceTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** SpaceTool.java 13 Sep 2006 13:36:19 -0000 1.37 --- SpaceTool.java 14 Sep 2006 09:21:50 -0000 1.38 *************** *** 23,26 **** --- 23,27 ---- import java.util.LinkedList; import java.util.List; + import java.util.Stack; import javax.swing.JMenu; *************** *** 561,590 **** HashMap globals = Project.getInstance().getGlobals().environment(); globals.put("cos", new Builtin() { ! public Object evaluate(Environment env) { Double argument = (Double) env.get(0); ! return new Double(Math.cos(argument.doubleValue())); } }); globals.put("sin", new Builtin() { ! public Object evaluate(Environment env) { Double argument = (Double) env.get(0); ! return new Double(Math.sin(argument.doubleValue())); } }); globals.put("vertex", new Builtin() { ! public Object evaluate(Environment env) { Double x = (Double) env.get(0); Double y = (Double) env.get(1); Double z = (Double) env.get(2); Vertex result = new Vertex(x.doubleValue(), y.doubleValue(), z.doubleValue()); ! return result; } }); globals.put("edge", new Builtin() { ! public Object evaluate(Environment env) { Vertex from = (Vertex) env.get(0); Vertex to = (Vertex) env.get(1); Edge result = new Edge(from, to); ! return result; } }); --- 562,591 ---- HashMap globals = Project.getInstance().getGlobals().environment(); globals.put("cos", new Builtin() { ! public void evaluate(Environment env, Stack stack) { Double argument = (Double) env.get(0); ! stack.push(new Double(Math.cos(argument.doubleValue()))); } }); globals.put("sin", new Builtin() { ! public void evaluate(Environment env, Stack stack) { Double argument = (Double) env.get(0); ! stack.push(new Double(Math.sin(argument.doubleValue()))); } }); globals.put("vertex", new Builtin() { ! public void evaluate(Environment env, Stack stack) { Double x = (Double) env.get(0); Double y = (Double) env.get(1); Double z = (Double) env.get(2); Vertex result = new Vertex(x.doubleValue(), y.doubleValue(), z.doubleValue()); ! stack.push(result); } }); globals.put("edge", new Builtin() { ! public void evaluate(Environment env, Stack stack) { Vertex from = (Vertex) env.get(0); Vertex to = (Vertex) env.get(1); Edge result = new Edge(from, to); ! stack.push(result); } }); *************** *** 609,624 **** Function function = new Function(); parser.statement(function); ! Object result = function.evaluate(env); ! if (result instanceof Vertex) { ! result = Geometry.insertVertex((Vertex)result, true); ! Selection.primary().set(result); ! } ! ! if (result instanceof Edge) { ! result = Geometry.insertEdge((Edge)result, true); ! Selection.primary().set(result); } ! ! glv.setLengthValue(result.toString()); typing = false; --- 610,628 ---- Function function = new Function(); parser.statement(function); ! Stack stack = new Stack(); ! function.evaluate(env, stack); ! while (!stack.empty()) { ! Object result = stack.pop(); ! if (result instanceof Vertex) { ! result = Geometry.insertVertex((Vertex)result, true); ! Selection.primary().add(result); ! } else if (result instanceof Edge) { ! result = Geometry.insertEdge((Edge)result, true); ! Selection.primary().add(result); ! } else { ! glv.setLengthValue(result.toString()); ! } } ! typing = false; |
|
From: Michael L. <he...@us...> - 2006-09-14 09:21:49
|
Update of /cvsroot/bprocessor/bscript/src/net/sourceforge/bprocessor/model/evaluator In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31054/src/net/sourceforge/bprocessor/model/evaluator Modified Files: Invokable.java Function.java Call.java Log Message: Improved scripting Index: Function.java =================================================================== RCS file: /cvsroot/bprocessor/bscript/src/net/sourceforge/bprocessor/model/evaluator/Function.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Function.java 13 Sep 2006 13:36:32 -0000 1.4 --- Function.java 14 Sep 2006 09:21:46 -0000 1.5 *************** *** 73,87 **** /** ! * ! * @return result */ ! public Object evaluate(Environment env) { Iterator iter = operations.iterator(); - Stack stack = new Stack(); while (iter.hasNext()) { Operation current = (Operation) iter.next(); current.evaluate(env, stack); } - return stack.pop(); } } --- 73,85 ---- /** ! * @param env Environment ! * @param stack Stack */ ! public void evaluate(Environment env, Stack stack) { Iterator iter = operations.iterator(); while (iter.hasNext()) { Operation current = (Operation) iter.next(); current.evaluate(env, stack); } } } Index: Invokable.java =================================================================== RCS file: /cvsroot/bprocessor/bscript/src/net/sourceforge/bprocessor/model/evaluator/Invokable.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Invokable.java 12 Sep 2006 09:27:30 -0000 1.1 --- Invokable.java 14 Sep 2006 09:21:46 -0000 1.2 *************** *** 8,11 **** --- 8,13 ---- package net.sourceforge.bprocessor.model.evaluator; + import java.util.Stack; + /** * Invokable *************** *** 13,19 **** public interface Invokable { /** ! * ! * @return result */ ! public Object evaluate(Environment env); } --- 15,21 ---- public interface Invokable { /** ! * @param env Environment ! * @param stack Stack */ ! public void evaluate(Environment env, Stack stack); } Index: Call.java =================================================================== RCS file: /cvsroot/bprocessor/bscript/src/net/sourceforge/bprocessor/model/evaluator/Call.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Call.java 13 Sep 2006 13:36:32 -0000 1.3 --- Call.java 14 Sep 2006 09:21:46 -0000 1.4 *************** *** 61,66 **** } Environment activation = new Environment(env, locals, arguments); ! Object result = invokable.evaluate(activation); ! stack.push(result); } else { stack.push(name); --- 61,65 ---- } Environment activation = new Environment(env, locals, arguments); ! invokable.evaluate(activation, stack); } else { stack.push(name); |
|
From: Michael L. <he...@us...> - 2006-09-14 09:21:49
|
Update of /cvsroot/bprocessor/bscript/lib In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31054/lib Modified Files: model.jar Log Message: Improved scripting Index: model.jar =================================================================== RCS file: /cvsroot/bprocessor/bscript/lib/model.jar,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvseE7xqf and /tmp/cvsJ9qFgd differ |
|
From: Michael L. <he...@us...> - 2006-09-14 09:21:49
|
Update of /cvsroot/bprocessor/bscript/src/etc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31054/src/etc Modified Files: bscript.g Log Message: Improved scripting Index: bscript.g =================================================================== RCS file: /cvsroot/bprocessor/bscript/src/etc/bscript.g,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** bscript.g 13 Sep 2006 13:36:32 -0000 1.6 --- bscript.g 14 Sep 2006 09:21:46 -0000 1.7 *************** *** 24,27 **** --- 24,30 ---- End : ';' ; Comma : ',' ; + Bar : '|' ; + Open : '<' ; + Close : '>' ; protected Letter *************** *** 94,97 **** --- 97,101 ---- | literal[env] | StartTerm expression[env] EndTerm + | Open statement[env] Close ; |
|
From: Michael L. <he...@us...> - 2006-09-13 13:36:37
|
Update of /cvsroot/bprocessor/bscript/lib In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5814/lib Modified Files: model.jar Log Message: Added a script to project that can contain userdefined functions Index: model.jar =================================================================== RCS file: /cvsroot/bprocessor/bscript/lib/model.jar,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvsN7ESdc and /tmp/cvsqVKC1p differ |
|
From: Michael L. <he...@us...> - 2006-09-13 13:36:34
|
Update of /cvsroot/bprocessor/bscript In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5814 Modified Files: build.xml Log Message: Added a script to project that can contain userdefined functions Index: build.xml =================================================================== RCS file: /cvsroot/bprocessor/bscript/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** build.xml 12 Sep 2006 09:27:31 -0000 1.3 --- build.xml 13 Sep 2006 13:36:32 -0000 1.4 *************** *** 6,9 **** --- 6,10 ---- <property name="tools.dir" value="${basedir}/../tools"/> <property name="build.dir" value="${basedir}/build"/> + <property name="model.dir" value="${basedir}/../model"/> <property name="src.dir" value="${basedir}/src"/> <property name="conf.dir" value="${src.dir}/etc"/> |
|
From: Michael L. <he...@us...> - 2006-09-13 13:36:34
|
Update of /cvsroot/bprocessor/bscript/src/net/sourceforge/bprocessor/model/evaluator In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5814/src/net/sourceforge/bprocessor/model/evaluator Modified Files: Environment.java Function.java Call.java Log Message: Added a script to project that can contain userdefined functions Index: Call.java =================================================================== RCS file: /cvsroot/bprocessor/bscript/src/net/sourceforge/bprocessor/model/evaluator/Call.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Call.java 13 Sep 2006 06:48:30 -0000 1.2 --- Call.java 13 Sep 2006 13:36:32 -0000 1.3 *************** *** 10,13 **** --- 10,14 ---- import java.util.ArrayList; import java.util.HashMap; + import java.util.Iterator; import java.util.List; import java.util.Stack; *************** *** 46,53 **** } stack.pop(); ! Invokable function = (Invokable) env.lookupGlobal(name); ! if (function != null) { ! Environment activation = new Environment(env, new HashMap(), arguments); ! Object result = function.evaluate(activation); stack.push(result); } else { --- 47,65 ---- } stack.pop(); ! Invokable invokable = (Invokable) env.lookupGlobal(name); ! if (invokable != null) { ! HashMap locals = new HashMap(); ! if (invokable instanceof Function) { ! Function function = (Function) invokable; ! Iterator names = function.formals().iterator(); ! Iterator values = arguments.iterator(); ! while (names.hasNext()) { ! String name = (String) names.next(); ! Object value = values.next(); ! locals.put(name, value); ! } ! } ! Environment activation = new Environment(env, locals, arguments); ! Object result = invokable.evaluate(activation); stack.push(result); } else { Index: Function.java =================================================================== RCS file: /cvsroot/bprocessor/bscript/src/net/sourceforge/bprocessor/model/evaluator/Function.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Function.java 12 Sep 2006 09:27:31 -0000 1.3 --- Function.java 13 Sep 2006 13:36:32 -0000 1.4 *************** *** 20,23 **** --- 20,29 ---- public final static Object mark = new Object(); + /** name */ + private String name; + + /** formals */ + private List formals; + /** operations */ private List operations; *************** *** 32,35 **** --- 38,60 ---- /** + * Constructor + */ + public Function(String name) { + super(); + this.name = name; + operations = new LinkedList(); + } + + /** + * Constructor + */ + public Function(String name, List formals) { + super(); + this.name = name; + this.formals = formals; + operations = new LinkedList(); + } + + /** * Append operation * @param operation Operation *************** *** 41,44 **** --- 66,77 ---- /** * + * @return formals + */ + public List formals() { + return formals; + } + + /** + * * @return result */ Index: Environment.java =================================================================== RCS file: /cvsroot/bprocessor/bscript/src/net/sourceforge/bprocessor/model/evaluator/Environment.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Environment.java 13 Sep 2006 06:48:30 -0000 1.2 --- Environment.java 13 Sep 2006 13:36:32 -0000 1.3 *************** *** 77,80 **** --- 77,83 ---- } } + if (value == null) { + value = new Double(8.9); + } return value; } |
|
From: Michael L. <he...@us...> - 2006-09-13 13:36:34
|
Update of /cvsroot/bprocessor/bscript/src/etc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5814/src/etc Modified Files: bscript.g Log Message: Added a script to project that can contain userdefined functions Index: bscript.g =================================================================== RCS file: /cvsroot/bprocessor/bscript/src/etc/bscript.g,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** bscript.g 12 Sep 2006 12:59:36 -0000 1.5 --- bscript.g 13 Sep 2006 13:36:32 -0000 1.6 *************** *** 2,5 **** --- 2,8 ---- package net.sourceforge.bprocessor.parser; import net.sourceforge.bprocessor.model.evaluator.*; + import java.util.Map; + import java.util.List; + import java.util.LinkedList; } *************** *** 65,69 **** --- 68,87 ---- : statement[env] End ; + + script[Map map] + : ( definition[map] ) * + ; + definition[Map map] + { Function function; List formals = new LinkedList(); } + : "to" name:Identifier + ( formal:Identifier { formals.add(formal.getText()); } ) * + { function = new Function(name.getText(), formals); } + "begin" + ( statement[function] End ) * + "end" + { map.put(name.getText(), function); } + ; + statement[Function env] : name:Identifier { env.append(new Mark()); } |
|
From: Michael L. <he...@us...> - 2006-09-13 13:36:31
|
Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5804/src/net/sourceforge/bprocessor/model Modified Files: Project.java Log Message: Added a script to project that can contain userdefined functions Index: Project.java =================================================================== RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Project.java,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** Project.java 11 Sep 2006 14:53:59 -0000 1.72 --- Project.java 13 Sep 2006 13:36:22 -0000 1.73 *************** *** 89,92 **** --- 89,95 ---- private String name; + /** The script of the Project */ + private Description script; + /** * Get the instance *************** *** 106,109 **** --- 109,113 ---- super(); name = "new project"; + script = new Description(""); undoStack = new Stack(); redoStack = new Stack(); *************** *** 146,150 **** this.globals = globals; } - /** --- 150,153 ---- *************** *** 157,160 **** --- 160,171 ---- /** + * + * @return Script + */ + public String getScript() { + return script.toString(); + } + + /** * Add observer * @param observer The observer *************** *** 917,920 **** --- 928,933 ---- if (a.getName().equals("Name")) { setName((String)a.getValue()); + } else if (a.getName().equals("Script")) { + script = new Description(((String)a.getValue().toString())); } } *************** *** 934,937 **** --- 947,951 ---- new Double(EnergyCalc.energyLoss() / EnergyCalc.heatedArea()), false)); } + res.add(new Attribute("Script", script)); return res; } |
|
From: Michael L. <he...@us...> - 2006-09-13 13:36:27
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5796/src/net/sourceforge/bprocessor/gl/tool Modified Files: SpaceTool.java Log Message: Added a script to project that can contain userdefined functions Index: SpaceTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** SpaceTool.java 13 Sep 2006 08:08:38 -0000 1.36 --- SpaceTool.java 13 Sep 2006 13:36:19 -0000 1.37 *************** *** 557,604 **** */ public Object evaluate(String value) { ! Project.info("evaluate '" + value + "'"); ! Reader input = new StringReader(value); ! ScriptLexer lexer = new ScriptLexer(input); ! ScriptParser parser = new ScriptParser(lexer); ! Function function = new Function(); try { ! parser.statement(function); ! ! HashMap globals = Project.getInstance().getGlobals().environment(); ! globals.put("cos", new Builtin() { ! public Object evaluate(Environment env) { ! Double argument = (Double) env.get(0); ! return new Double(Math.cos(argument.doubleValue())); ! } ! }); ! globals.put("sin", new Builtin() { ! public Object evaluate(Environment env) { ! Double argument = (Double) env.get(0); ! return new Double(Math.sin(argument.doubleValue())); ! } ! }); ! globals.put("vertex", new Builtin() { ! public Object evaluate(Environment env) { ! Double x = (Double) env.get(0); ! Double y = (Double) env.get(1); ! Double z = (Double) env.get(2); ! Vertex result = new Vertex(x.doubleValue(), y.doubleValue(), z.doubleValue()); ! return result; ! } ! }); ! globals.put("edge", new Builtin() { ! public Object evaluate(Environment env) { ! Vertex from = (Vertex) env.get(0); ! Vertex to = (Vertex) env.get(1); ! Edge result = new Edge(from, to); ! return result; ! } ! }); ! Environment env = new Environment(globals, null); ! Object result = function.evaluate(env); - - if (result instanceof Vertex) { result = Geometry.insertVertex((Vertex)result, true); --- 557,613 ---- */ public Object evaluate(String value) { ! ! ! HashMap globals = Project.getInstance().getGlobals().environment(); ! globals.put("cos", new Builtin() { ! public Object evaluate(Environment env) { ! Double argument = (Double) env.get(0); ! return new Double(Math.cos(argument.doubleValue())); ! } ! }); ! globals.put("sin", new Builtin() { ! public Object evaluate(Environment env) { ! Double argument = (Double) env.get(0); ! return new Double(Math.sin(argument.doubleValue())); ! } ! }); ! globals.put("vertex", new Builtin() { ! public Object evaluate(Environment env) { ! Double x = (Double) env.get(0); ! Double y = (Double) env.get(1); ! Double z = (Double) env.get(2); ! Vertex result = new Vertex(x.doubleValue(), y.doubleValue(), z.doubleValue()); ! return result; ! } ! }); ! globals.put("edge", new Builtin() { ! public Object evaluate(Environment env) { ! Vertex from = (Vertex) env.get(0); ! Vertex to = (Vertex) env.get(1); ! Edge result = new Edge(from, to); ! return result; ! } ! }); ! ! ! ! String script = Project.getInstance().getScript(); try { ! Reader input = new StringReader(script); ! ScriptLexer lexer = new ScriptLexer(input); ! ScriptParser parser = new ScriptParser(lexer); ! parser.script(globals); ! } catch (Exception error) { ! Project.info(error); ! } ! try { ! Project.info("evaluate '" + value + "'"); Environment env = new Environment(globals, null); ! Reader input = new StringReader(value); ! ScriptLexer lexer = new ScriptLexer(input); ! ScriptParser parser = new ScriptParser(lexer); ! Function function = new Function(); ! parser.statement(function); Object result = function.evaluate(env); if (result instanceof Vertex) { result = Geometry.insertVertex((Vertex)result, true); |
|
From: Michael L. <he...@us...> - 2006-09-13 08:08:40
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2419/src/net/sourceforge/bprocessor/gl/tool Modified Files: SpaceTool.java Log Message: Added the sin builtin function Index: SpaceTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** SpaceTool.java 13 Sep 2006 06:48:15 -0000 1.35 --- SpaceTool.java 13 Sep 2006 08:08:38 -0000 1.36 *************** *** 572,575 **** --- 572,581 ---- } }); + globals.put("sin", new Builtin() { + public Object evaluate(Environment env) { + Double argument = (Double) env.get(0); + return new Double(Math.sin(argument.doubleValue())); + } + }); globals.put("vertex", new Builtin() { public Object evaluate(Environment env) { |
|
From: Michael L. <he...@us...> - 2006-09-13 06:48:32
|
Update of /cvsroot/bprocessor/bscript/src/net/sourceforge/bprocessor/model/evaluator In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2396/src/net/sourceforge/bprocessor/model/evaluator Modified Files: Environment.java Call.java Log Message: refactoring of scripting Index: Call.java =================================================================== RCS file: /cvsroot/bprocessor/bscript/src/net/sourceforge/bprocessor/model/evaluator/Call.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Call.java 12 Sep 2006 09:27:30 -0000 1.1 --- Call.java 13 Sep 2006 06:48:30 -0000 1.2 *************** *** 8,12 **** package net.sourceforge.bprocessor.model.evaluator; ! import java.util.LinkedList; import java.util.List; import java.util.Stack; --- 8,13 ---- package net.sourceforge.bprocessor.model.evaluator; ! import java.util.ArrayList; ! import java.util.HashMap; import java.util.List; import java.util.Stack; *************** *** 34,46 **** */ public void evaluate(Environment env, Stack stack) { ! List arguments = new LinkedList(); ! Object current = stack.pop(); ! while (current != Function.mark) { ! arguments.add(current); ! current = stack.pop(); } ! Invokable function = env.lookupFunction(name); if (function != null) { ! Object result = function.evaluate(env.copy(arguments)); stack.push(result); } else { --- 35,53 ---- */ public void evaluate(Environment env, Stack stack) { ! int length = stack.search(Function.mark) - 1; ! List arguments = new ArrayList(length); ! for (int i = 0; i < length; i++) { ! arguments.add(null); } ! while (length > 0) { ! Object current = stack.pop(); ! arguments.set(length - 1, current); ! length--; ! } ! stack.pop(); ! Invokable function = (Invokable) env.lookupGlobal(name); if (function != null) { ! Environment activation = new Environment(env, new HashMap(), arguments); ! Object result = function.evaluate(activation); stack.push(result); } else { Index: Environment.java =================================================================== RCS file: /cvsroot/bprocessor/bscript/src/net/sourceforge/bprocessor/model/evaluator/Environment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Environment.java 12 Sep 2006 09:27:30 -0000 1.1 --- Environment.java 13 Sep 2006 06:48:30 -0000 1.2 *************** *** 17,54 **** */ public class Environment { ! /** Functions */ ! private HashMap functions; /** Globals */ ! private HashMap globals; /** Locals */ ! private List locals; /** * Constructor */ ! public Environment(HashMap functions, HashMap globals, List locals) { super(); ! this.functions = functions; ! this.globals = globals; ! this.locals = locals; } /** ! * Return a copy with locals replaced ! * @param locals List ! * @return Environment */ ! public Environment copy(List locals) { ! return new Environment(functions, globals, locals); } /** ! * @param name String ! * @return Function */ ! public Invokable lookupFunction(String name) { ! return (Invokable) functions.get(name); } --- 17,59 ---- */ public class Environment { ! ! /** Lexical link */ ! private Environment origin; /** Globals */ ! private HashMap variables; /** Locals */ ! private List indexables; /** * Constructor */ ! public Environment(HashMap variables, List indexables) { super(); ! this.variables = variables; ! this.indexables = indexables; } /** ! * ! * @param origin Environment ! * @param variables HashMap ! * @param indexables List */ ! public Environment(Environment origin, HashMap variables, List indexables) { ! super(); ! this.variables = variables; ! this.indexables = indexables; ! this.origin = origin; } /** ! * Return a copy with locals replaced ! * @param locals List ! * @return Environment */ ! public Environment copy(List locals) { ! return new Environment(variables, locals); } *************** *** 58,62 **** */ public Object lookupGlobal(String name) { ! Object value = globals.get(name); if (value == null) { Space active = Project.getInstance().getActiveSpace(); --- 63,72 ---- */ public Object lookupGlobal(String name) { ! Object value = variables.get(name); ! if (value == null) { ! if (origin != null) { ! value = origin.lookupGlobal(name); ! } ! } if (value == null) { Space active = Project.getInstance().getActiveSpace(); *************** *** 76,80 **** */ public Object get(int i) { ! return locals.get(i); } } --- 86,90 ---- */ public Object get(int i) { ! return indexables.get(i); } } |
|
From: Michael L. <he...@us...> - 2006-09-13 06:48:32
|
Update of /cvsroot/bprocessor/bscript/lib In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2396/lib Modified Files: model.jar Log Message: refactoring of scripting Index: model.jar =================================================================== RCS file: /cvsroot/bprocessor/bscript/lib/model.jar,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsQyq3nF and /tmp/cvs5XsCYh differ |
|
From: Michael L. <he...@us...> - 2006-09-13 06:48:18
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2383/src/net/sourceforge/bprocessor/gl/tool Modified Files: SpaceTool.java Log Message: refactoring of scripting Index: SpaceTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** SpaceTool.java 12 Sep 2006 12:59:40 -0000 1.34 --- SpaceTool.java 13 Sep 2006 06:48:15 -0000 1.35 *************** *** 566,571 **** HashMap globals = Project.getInstance().getGlobals().environment(); ! HashMap functions = new HashMap(); ! functions.put("cos", new Builtin() { public Object evaluate(Environment env) { Double argument = (Double) env.get(0); --- 566,570 ---- HashMap globals = Project.getInstance().getGlobals().environment(); ! globals.put("cos", new Builtin() { public Object evaluate(Environment env) { Double argument = (Double) env.get(0); *************** *** 573,589 **** } }); ! functions.put("vertex", new Builtin() { public Object evaluate(Environment env) { ! Double z = (Double) env.get(0); Double y = (Double) env.get(1); ! Double x = (Double) env.get(2); Vertex result = new Vertex(x.doubleValue(), y.doubleValue(), z.doubleValue()); return result; } }); ! functions.put("edge", new Builtin() { public Object evaluate(Environment env) { ! Vertex from = (Vertex) env.get(1); ! Vertex to = (Vertex) env.get(0); Edge result = new Edge(from, to); return result; --- 572,588 ---- } }); ! globals.put("vertex", new Builtin() { public Object evaluate(Environment env) { ! Double x = (Double) env.get(0); Double y = (Double) env.get(1); ! Double z = (Double) env.get(2); Vertex result = new Vertex(x.doubleValue(), y.doubleValue(), z.doubleValue()); return result; } }); ! globals.put("edge", new Builtin() { public Object evaluate(Environment env) { ! Vertex from = (Vertex) env.get(0); ! Vertex to = (Vertex) env.get(1); Edge result = new Edge(from, to); return result; *************** *** 591,595 **** }); ! Environment env = new Environment(functions, globals, null); Object result = function.evaluate(env); --- 590,594 ---- }); ! Environment env = new Environment(globals, null); Object result = function.evaluate(env); |
|
From: Michael L. <he...@us...> - 2006-09-12 12:59:50
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26004/src/net/sourceforge/bprocessor/gl/tool Modified Files: AbstractTool.java SpaceTool.java Log Message: changes to the syntax Index: SpaceTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/SpaceTool.java,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** SpaceTool.java 12 Sep 2006 09:25:48 -0000 1.33 --- SpaceTool.java 12 Sep 2006 12:59:40 -0000 1.34 *************** *** 563,567 **** Function function = new Function(); try { ! parser.expression(function); HashMap globals = Project.getInstance().getGlobals().environment(); --- 563,567 ---- Function function = new Function(); try { ! parser.statement(function); HashMap globals = Project.getInstance().getGlobals().environment(); *************** *** 627,631 **** } char ch = event.getKeyChar(); ! if (ch > 32 && ch < 128) { value = value + ch; glv.setLengthValue(value); --- 627,631 ---- } char ch = event.getKeyChar(); ! if (ch > 31 && ch < 128) { value = value + ch; glv.setLengthValue(value); Index: AbstractTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v retrieving revision 1.100 retrieving revision 1.101 diff -C2 -d -r1.100 -r1.101 *** AbstractTool.java 11 Sep 2006 22:57:21 -0000 1.100 --- AbstractTool.java 12 Sep 2006 12:59:40 -0000 1.101 *************** *** 224,230 **** if (e.getKeyCode() == KeyEvent.VK_SPACE) { ! cameraMode = true; ! glv.setCursor(orbitCursor); ! return; } if (e.getKeyCode() == KeyEvent.VK_BACK_SPACE || e.getKeyCode() == KeyEvent.VK_DELETE) { --- 224,232 ---- if (e.getKeyCode() == KeyEvent.VK_SPACE) { ! if (!typing) { ! cameraMode = true; ! glv.setCursor(orbitCursor); ! return; ! } } if (e.getKeyCode() == KeyEvent.VK_BACK_SPACE || e.getKeyCode() == KeyEvent.VK_DELETE) { |
|
From: Michael L. <he...@us...> - 2006-09-12 12:59:39
|
Update of /cvsroot/bprocessor/bscript/src/etc In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25986/src/etc Modified Files: bscript.g Log Message: changes to the syntax Index: bscript.g =================================================================== RCS file: /cvsroot/bprocessor/bscript/src/etc/bscript.g,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** bscript.g 12 Sep 2006 09:27:31 -0000 1.4 --- bscript.g 12 Sep 2006 12:59:36 -0000 1.5 *************** *** 63,68 **** program[Function env] ! : expression[env] End ; expression[Function env] : term[env] --- 63,81 ---- program[Function env] ! : statement[env] End ; + + statement[Function env] + : name:Identifier { env.append(new Mark()); } + ( simpleton[env] )* + { env.append(new Call(name.getText())); } + ; + + simpleton[Function env] + : variable[env] + | literal[env] + | StartTerm expression[env] EndTerm + ; + expression[Function env] : term[env] |
|
From: Michael L. <he...@us...> - 2006-09-12 12:59:39
|
Update of /cvsroot/bprocessor/bscript/lib In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25986/lib Modified Files: model.jar Log Message: changes to the syntax Index: model.jar =================================================================== RCS file: /cvsroot/bprocessor/bscript/lib/model.jar,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs2nqunJ and /tmp/cvsYsl1Qj differ |
