/ - Diff - Application: gvSIG desktop - gvSIG

trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.api/src/main/java/org/gvsig/expressionevaluator/spi/AbstractLexicalAnalyzer.java
409	409	}
410	410	while (true) {
411	411	if (ch == EOF) {
412		throw new ExpressionSyntaxException(I18N.End_of_string_was_expected_and_end_of_source_was_found(), this);
	412	// throw new ExpressionSyntaxException(I18N.End_of_string_was_expected_and_end_of_source_was_found(), this);
	413	break;
413	414	}
414	415	if( !Character.isDigit(ch) ) {
415	416	break;
...	...
422	423	} else {
423	424	s_d = 0;
424	425	}
425		if( !StringUtils.contains(" \"", ch) ) {
	426	if( ch!=EOF && !StringUtils.contains(" \"", ch) ) {
426	427	throw new ExpressionSyntaxException(I18N.Expected_XexpectedX_and_found_XfoundX(" ", String.valueOf(ch)), this);
427	428	}
428	429

         public MutableSymbolTable createSymbolTable();
         public SymbolTable getInmutableSymbolTable();
         public SymbolTable getSymbolTable(String name);
         public Collection<SymbolTableFactory> getSymbolTableFactories();

             if( StringUtils.isBlank(expression) ) {
                 return null;
+            }
             if( symbolTable==null ) {
                 symbolTable = createSymbolTable();
+            }
             ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
             Object x = manager.evaluate(symbolTable, expression);
             return x;
-...
             if( StringUtils.isBlank(s) ) {
                 throw new NumberFormatException("Can't get integer from a blank string.");
+            }
             MutableSymbolTable symbolTable = createSymbolTable();
             ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
             SymbolTable symbolTable = null; //manager.getInmutableSymbolTable();
             Object x;
             try {
                 x = manager.evaluate(symbolTable, s);
-...
             if( StringUtils.isBlank(s) ) {
                 throw new NumberFormatException("Can't get long from a blank string.");
+            }
             MutableSymbolTable symbolTable = createSymbolTable();
             ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
             SymbolTable symbolTable = null; //manager.getInmutableSymbolTable();
             Object x;
             try {
                 x = manager.evaluate(symbolTable, s);
-...
             if( StringUtils.isBlank(s) ) {
                 throw new NumberFormatException("Can't get double from a blank string.");
+            }
             MutableSymbolTable symbolTable = createSymbolTable();
             ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
             SymbolTable symbolTable = null; //manager.getInmutableSymbolTable();
             Object x;
             try {
                 x = manager.evaluate(symbolTable, s);

     package org.gvsig.expressionevaluator.impl;
     import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
     import org.gvsig.expressionevaluator.SymbolTable;
     import org.gvsig.expressionevaluator.spi.AbstractSymbolTable;
     /**
+     *
      * @author jjdelcerro
      */
     public class InmutableSymbolTable
             extends AbstractSymbolTable
             implements SymbolTable {
         private boolean locked;
         public InmutableSymbolTable() {
             this.locked = false;
             this.init();
+        }
         private void init() {
             DefaultExpressionEvaluatorManager manager = (DefaultExpressionEvaluatorManager) ExpressionEvaluatorLocator.getManager();
             manager.populateSymbolTable(this);
             this.locked = true;
+        }
         @Override
         public boolean addSymbolTable(SymbolTable symbolTable) {
             if( this.locked ) {
                 throw new UnsupportedOperationException();
+            }
             return super.addSymbolTable(symbolTable);
+        }
         @Override
         public boolean removeSymbolTable(SymbolTable symbolTable) {
             throw new UnsupportedOperationException();
+        }
+    }

         private final Map<String,GrammarFactory> grammarFactories;
         private Bookmarks<Expression> bookmarks;
         private History<Expression> history;
         private SymbolTable inmutableSymbolTable;
         public DefaultExpressionEvaluatorManager() {
             this.symbolTableFactories = new HashMap<>();
-...
                 throw new IllegalArgumentException("factory can't be null");
+            }
             this.symbolTableFactories.put(factory.getName().toUpperCase(),factory);
             this.inmutableSymbolTable = null;
+        }
         @Override
         public SymbolTable getInmutableSymbolTable() {
             if( this.inmutableSymbolTable==null ) {
                 this.inmutableSymbolTable = new InmutableSymbolTable();
+            }
             return this.inmutableSymbolTable;
+        }
         @Override
         public Object evaluate(String source) {
             DefaultInterpreter interpreter = new DefaultInterpreter();
             DefaultCompiler compiler = new DefaultCompiler();
-...
             DefaultInterpreter interpreter = new DefaultInterpreter();
             DefaultCompiler compiler = new DefaultCompiler();
             Code code = compiler.compileExpression(source);
             interpreter.setSymbolTable(symbolTable);
             if( symbolTable!=null ) {
                 interpreter.setSymbolTable(symbolTable);
+            }
             return interpreter.run(code);
+        }
         @Override
         public Object evaluate(SymbolTable symbolTable, Code code) {
             DefaultInterpreter interpreter = new DefaultInterpreter();
             interpreter.setSymbolTable(symbolTable);
             if( symbolTable!=null ) {
                 interpreter.setSymbolTable(symbolTable);
+            }
             return interpreter.run(code);
+        }

Application: gvSIG desktop

Revision 44446