Revision 44533 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/java/org/gvsig/expressionevaluator/impl/grammars/BasicGrammarFactory.java

View differences:

BasicGrammarFactory.java
185 185
            stmt.addRule(stmt.optional_identifiers("PARAM_NAMES", ","));
186 186
            stmt.addRule(stmt.optional_any_token(")"));
187 187
            stmt.addRule(stmt.require_any_token("AS"));
188
            stmt.addRule(stmt.optional_any_token("$$","BEGIN"));
189
            stmt.addRule(stmt.require_expressions("BODY", ";"));
190
            stmt.addRule(stmt.require_any_token("$$", "END"));
191
            stmt.addRule(stmt.optional_any_token("FUNCTION", "PROCEDURE"));
188
            stmt.addRule(stmt.optional_any_token("$$","BEGIN")
189
                    .addRuleOnTrue(stmt.require_expressions("BODY", ";"))
190
                    .addRuleOnTrue(stmt.require_any_token("$$", "END"))
191
                    .addRuleOnTrue(stmt.optional_any_token("FUNCTION", "PROCEDURE"))
192
                    .addRuleOnFalse(stmt.optional_literal_string("SCRIPT_PATH")
193
                        .addRuleOnTrue(stmt.require_any_token(","))
194
                        .addRuleOnTrue(stmt.require_identifier("SCRIPT_FUNCTION"))
195
                        .addRuleOnTrue(stmt.optional_any_token("LANGUAGE")
196
                                .addRuleOnTrue(stmt.require_literal_string("LANGUAGE"))
197
                        )
198
                    )
199
            );
200
                    
201
//            stmt.addRule(stmt.require_expressions("BODY", ";"));
202
//            stmt.addRule(stmt.require_any_token("$$", "END"));
203
//            stmt.addRule(stmt.optional_any_token("FUNCTION", "PROCEDURE"));
192 204
            stmt.code(
193 205
                    CreateFnFunction.NAME,
194
                    stmt.args_names("FUNCTION_NAME","PARAM_NAMES","BODY")
206
                    stmt.args_names("FUNCTION_NAME","PARAM_NAMES","BODY", "SCRIPT_PATH", "SCRIPT_FUNCTION", "LANGUAGE")
195 207
            ); 
196 208
            theGrammar.addStatement(stmt);
197 209

  

Also available in: Unified diff