ben/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

version 1.4.9

Browse source
This commit is contained in:
Arndt Brenschede 2017-09-24 17:11:04 +02:00
parent 0171ba39a0
commit c517ccc2df
43 changed files with 2002 additions and 508 deletions
Download patch file Download diff file Expand all files Collapse all files

20
brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java
View file

@ -27,11 +27,14 @@ import btools.util.LruMap;
public abstract class BExpressionContext implements IByteArrayUnifier
{
private static final String CONTEXT_TAG = "---context:";
private static final String MODEL_TAG = "---model:";
private String context;
private boolean _inOurContext = false;
private BufferedReader _br = null;
private boolean _readerDone = false;
public String _modelClass;
private Map<String,Integer> lookupNumbers = new HashMap<String,Integer>();
private ArrayList<BExpressionLookupValue[]> lookupValues = new ArrayList<BExpressionLookupValue[]>();
@ -79,7 +82,7 @@ public abstract class BExpressionContext implements IByteArrayUnifier
abstract String[] getBuildInVariableNames();
protected final float getBuildInVariable( int idx )
public final float getBuildInVariable( int idx )
{
return currentVars[idx+currentVarOffset];
}
@ -678,14 +681,17 @@ public abstract class BExpressionContext implements IByteArrayUnifier
return num != null && lookupData[num.intValue()] == 2;
}
public int getOutputVariableIndex( String name )
public int getOutputVariableIndex( String name, boolean mustExist )
{
int idx = getVariableIdx( name, false );
if ( idx < 0 )
{
throw new IllegalArgumentException( "unknown variable: " + name );
if ( mustExist )
{
throw new IllegalArgumentException( "unknown variable: " + name );
}
}
if ( idx < minWriteIdx )
else if ( idx < minWriteIdx )
{
throw new IllegalArgumentException( "bad access to global variable: " + name );
}
@ -719,7 +725,7 @@ public abstract class BExpressionContext implements IByteArrayUnifier
{
throw new IllegalArgumentException( "unknown foreign context: " + context );
}
return foreignContext.getOutputVariableIndex( name );
return foreignContext.getOutputVariableIndex( name, true );
}
public void parseFile( File file, String readOnlyContext )
@ -884,6 +890,10 @@ public abstract class BExpressionContext implements IByteArrayUnifier
{
_inOurContext = token.substring( CONTEXT_TAG.length() ).equals( context );
}
else if ( token.startsWith( MODEL_TAG ) )
{
_modelClass = token.substring( MODEL_TAG.length() ).trim();
}
else if ( _inOurContext )
{
return token;

35
brouter-expressions/src/main/java/btools/expressions/BExpressionContextGlobal.java
View file

@ -1,35 +0,0 @@
// context for simple expression
// context means:
// - the local variables
// - the local variable names
// - the lookup-input variables
package btools.expressions;
public final class BExpressionContextGlobal extends BExpressionContext
{
private static String[] buildInVariables =
{};
protected String[] getBuildInVariableNames()
{
return buildInVariables;
}
public BExpressionContextGlobal( BExpressionMetaData meta )
{
super( "global", meta );
}
/**
* Create an Expression-Context for way context
*
* @param hashSize size of hashmap for result caching
*/
public BExpressionContextGlobal( int hashSize, BExpressionMetaData meta )
{
super( "global", hashSize, meta );
}
}