235748 - Reorganize Transformiix directories

Status: RESOLVED FIXED

(Core :: XSLT, defect)

Description

[Peter Van der Beken [:peterv]]

One more time.

I propose to move source/xml/parser into source/xml, source/xml/dom/standalone
into source/xml/dom (or into source/xml or into source/dom?), source/xslt/util
into source/xslt. Do we want to move source/xslt/functions?

Comment 1

[Jonas Sicking (:sicking) No longer reading bugmail consistently]

ideally we should clean up the standalone "dom" and create nodes that are much
more similar. If we did that we would most likly fit all the the standalone dom
inside a single .cpp file. If so we could just move that into source/xml IMHO.

Comment 2

[Peter Van der Beken [:peterv]]

Ok, then I propose this:

To mozilla/extensions/transformiix/source/xml/
mozilla/extensions/transformiix/source/xml/parser/txXMLParser.cpp
mozilla/extensions/transformiix/source/xml/parser/txXMLParser.h
mozilla/extensions/transformiix/source/xml/dom/standalone/Attr.cpp
mozilla/extensions/transformiix/source/xml/dom/standalone/Document.cpp
mozilla/extensions/transformiix/source/xml/dom/standalone/Element.cpp
mozilla/extensions/transformiix/source/xml/dom/standalone/NamedNodeMap.cpp
mozilla/extensions/transformiix/source/xml/dom/standalone/NodeDefinition.cpp
mozilla/extensions/transformiix/source/xml/dom/standalone/NodeListDefinition.cpp
mozilla/extensions/transformiix/source/xml/dom/standalone/ProcessingInstruction.cpp
 
mozilla/extensions/transformiix/source/xml/dom/standalone/dom.h

To mozilla/extensions/transformiix/source/xslt/
mozilla/extensions/transformiix/source/xslt/util/txNodeSorter.cpp
mozilla/extensions/transformiix/source/xslt/util/txNodeSorter.h
mozilla/extensions/transformiix/source/xslt/util/txXPathResultComparator.cpp
mozilla/extensions/transformiix/source/xslt/util/txXPathResultComparator.h

Comment 3

[Axel Hecht]

what about functions?
We could leave them where they are, I guess, we'd prolly want to put extension
functions there, too. But I'd prefer to not go into too many subdirs for the
extension functions. Or should those go into xslt/extensions/foo?

Comment 4

[Peter Van der Beken [:peterv]]

Attachment: Proposed repository copies

Comment 5

[Peter Van der Beken [:peterv]]

I propose we combine these three files into a txCore.h:
transformiix/source/base/baseutils.h
transformiix/source/base/primitives.h
transformiix/source/base/TxObject.h

Copy the files as shown in attachment 148461 [details].

That leaves us with these:
transformiix/source/base/Double.cpp
transformiix/source/base/ErrorObserver.h
transformiix/source/base/List.cpp
transformiix/source/base/List.h
transformiix/source/base/SimpleErrorObserver.cpp
transformiix/source/base/TxLog.h
transformiix/source/main/testXalan.cpp
transformiix/source/main/transformiix.cpp
transformiix/source/xpath/AdditiveExpr.cpp
transformiix/source/xpath/AttributeValueTemplate.cpp
transformiix/source/xpath/BooleanExpr.cpp
transformiix/source/xpath/BooleanFunctionCall.cpp
transformiix/source/xpath/BooleanResult.cpp
transformiix/source/xpath/Expr.h
transformiix/source/xpath/ExprLexer.cpp
transformiix/source/xpath/ExprLexer.h
transformiix/source/xpath/ExprParser.cpp
transformiix/source/xpath/ExprParser.h
transformiix/source/xpath/ExprResult.h
transformiix/source/xpath/FilterExpr.cpp
transformiix/source/xpath/FunctionCall.cpp
transformiix/source/xpath/FunctionLib.h
transformiix/source/xpath/LocationStep.cpp
transformiix/source/xpath/MultiplicativeExpr.cpp
transformiix/source/xpath/NodeSetFunctionCall.cpp
transformiix/source/xpath/NumberFunctionCall.cpp
transformiix/source/xpath/NumberResult.cpp
transformiix/source/xpath/PathExpr.cpp
transformiix/source/xpath/PredicateList.cpp
transformiix/source/xpath/RelationalExpr.cpp
transformiix/source/xpath/RootExpr.cpp
transformiix/source/xpath/StringFunctionCall.cpp
transformiix/source/xpath/StringResult.cpp
transformiix/source/xpath/UnaryExpr.cpp
transformiix/source/xpath/UnionExpr.cpp
transformiix/source/xpath/VariableRefExpr.cpp

Do we want to get those prefixed too? TxLog.h sucks, since changing case won't
be possible I think :-).

Comment 6

[Jonas Sicking (:sicking) No longer reading bugmail consistently]

renaming all the expr files would cause a lot of pain for the patch in the 
optimized xpath bug. Don't know if we care though...

Comment 7

[Axel Hecht]

I'd be fine with just the copies and the header file compacting.
I'm not too keen on renaming all those files, we're used to the names, IMHO.

Comment 8

[Peter Van der Beken [:peterv]]

Attachment: Step 1

Comment 9

[Jonas Sicking (:sicking) No longer reading bugmail consistently]

Is there anything left here to do now?

Comment 10

[Benjamin Smedberg]

Fixed by bug 304494.