From 938ed7622656c3494ae8fdb83bc2ad4b1f31d901 Mon Sep 17 00:00:00 2001 From: Adrian Kummerländer Date: Fri, 25 Apr 2014 17:44:32 +0200 Subject: Improved argument resolution and error handling * execute member method internal argument count checks are not needed when using between one and two arguments ** xalan automatically generates the appropriate message containing the getError message when only offered fixed argument execute member overloads * improved FunctionReadDirectory attribute element generation * added additional validations to FunctionReadFile and FunctionReadXMLFile * I plan to return errors inside a DOM tree alongside the function return values in the future --- src/function/read_directory.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/function/read_directory.h') diff --git a/src/function/read_directory.h b/src/function/read_directory.h index 3c55591..782ebed 100644 --- a/src/function/read_directory.h +++ b/src/function/read_directory.h @@ -22,7 +22,7 @@ class FunctionReadDirectory : public xalan::Function { virtual xalan::XObjectPtr execute( xalan::XPathExecutionContext&, xalan::XalanNode*, - const xalan::Function::XObjectArgVectorType&, + const xalan::XObjectPtr, const xalan::Locator* ) const; @@ -34,7 +34,9 @@ class FunctionReadDirectory : public xalan::Function { private: const FilesystemContext& fs_context_; - std::shared_ptr> documents_; + std::shared_ptr< + std::stack + > documents_; const xalan::XalanDOMString& getError(xalan::XalanDOMString&) const; -- cgit v1.2.3