Sarissa is a utility class. Provides static methods for DOMDocument and + *
Sarissa is a utility class. Provides "static" methods for DOMDocument and * XMLHTTP objects, DOM Node serializatrion to XML strings and other goodies.
* @constructor */ @@ -62,9 +58,8 @@ var _SARISSA_HAS_DOM_CREATE_DOCUMENT = _SARISSA_HAS_DOM_IMPLEMENTATION && document.implementation.createDocument; var _SARISSA_HAS_DOM_FEATURE = _SARISSA_HAS_DOM_IMPLEMENTATION && document.implementation.hasFeature; var _SARISSA_IS_MOZ = _SARISSA_HAS_DOM_CREATE_DOCUMENT && _SARISSA_HAS_DOM_FEATURE; -var _SARISSA_IS_SAFARI = navigator.userAgent.toLowerCase().indexOf("applewebkit") != -1; +var _SARISSA_IS_SAFARI = (navigator.userAgent && navigator.vendor && (navigator.userAgent.toLowerCase().indexOf("applewebkit") != -1 || navigator.vendor.indexOf("Apple") != -1)); var _SARISSA_IS_IE = document.all && window.ActiveXObject && navigator.userAgent.toLowerCase().indexOf("msie") > -1 && navigator.userAgent.toLowerCase().indexOf("opera") == -1; - if(!window.Node || !window.Node.ELEMENT_NODE){ var Node = {ELEMENT_NODE: 1, ATTRIBUTE_NODE: 2, TEXT_NODE: 3, CDATA_SECTION_NODE: 4, ENTITY_REFERENCE_NODE: 5, ENTITY_NODE: 6, PROCESSING_INSTRUCTION_NODE: 7, COMMENT_NODE: 8, DOCUMENT_NODE: 9, DOCUMENT_TYPE_NODE: 10, DOCUMENT_FRAGMENT_NODE: 11, NOTATION_NODE: 12}; }; @@ -130,14 +125,14 @@ }; return oDoc; }; - // see non-IE version + // see non-IE version Sarissa.getParseErrorText = function (oDoc) { var parseErrorText = Sarissa.PARSED_OK; if(oDoc.parseError != 0){ - parseErrorText = "XML Parsing Error: " + oDoc.parseError.reason + - "\nLocation: " + oDoc.parseError.url + - "\nLine Number " + oDoc.parseError.line + ", Column " + - oDoc.parseError.linepos + + parseErrorText = "XML Parsing Error: " + oDoc.parseError.reason + + "\nLocation: " + oDoc.parseError.url + + "\nLine Number " + oDoc.parseError.line + ", Column " + + oDoc.parseError.linepos + ":\n" + oDoc.parseError.srcText + "\n"; for(var i = 0; i < oDoc.parseError.linepos;i++){ @@ -151,9 +146,9 @@ Sarissa.setXpathNamespaces = function(oDoc, sNsSet) { oDoc.setProperty("SelectionLanguage", "XPath"); oDoc.setProperty("SelectionNamespaces", sNsSet); - }; + }; /** - * Basic implementation of Mozilla's XSLTProcessor for IE. + * Basic implementation of Mozilla's XSLTProcessor for IE. * Reuses the same XSLT stylesheet for multiple transforms * @constructor */ @@ -167,7 +162,7 @@ */ XSLTProcessor.prototype.importStylesheet = function(xslDoc){ // convert stylesheet to free threaded - var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID); + var converted = new ActiveXObject(_SARISSA_THREADEDDOM_PROGID); converted.loadXML(xslDoc.xml); this.template.stylesheet = converted; this.processor = this.template.createProcessor(); @@ -182,20 +177,11 @@ XSLTProcessor.prototype.transformToDocument = function(sourceDoc){ this.processor.input = sourceDoc; var outDoc = new ActiveXObject(_SARISSA_DOM_PROGID); - this.processor.output = outDoc; + this.processor.output = outDoc; this.processor.transform(); return outDoc; }; /** - * Not sure if this works in IE. Maybe this will allow non-well-formed - * transformation results (i.e. with no single root element) - * @argument sourceDoc The XML DOMDocument to transform - * @return The transformation result as a DOM Fragment - */ - XSLTProcessor.prototype.transformToFragment = function(sourceDoc, ownerDocument){ - return this.transformToDocument(sourceDoc); - }; - /** * Set global XSLT parameter of the imported stylesheet * @argument nsURI The parameter namespace URI * @argument name The parameter base name @@ -222,14 +208,51 @@ * @return The parameter value if reviously set by setParameter, null otherwise */ XSLTProcessor.prototype.getParameter = function(nsURI, name){ - if(this.paramsSet[""+nsURI] && this.paramsSet[""+nsURI][name]) - return this.paramsSet[""+nsURI][name]; - else + nsURI = nsURI || ""; + if(nsURI in this.paramsSet && name in this.paramsSet[nsURI]){ + return this.paramsSet[nsURI][name]; + }else{ return null; + }; }; } else{ /* end IE initialization, try to deal with real browsers now ;-) */ - if(_SARISSA_HAS_DOM_CREATE_DOCUMENT){ + if(_SARISSA_HAS_DOM_CREATE_DOCUMENT){ + /** + *Ensures the document was loaded correctly, otherwise sets the + * parseError to -1 to indicate something went wrong. Internal use
+ * @private + */ + Sarissa.__handleLoad__ = function(oDoc){ + if (!oDoc.documentElement || oDoc.documentElement.tagName == "parsererror") + oDoc.parseError = -1; + Sarissa.__setReadyState__(oDoc, 4); + }; + /** + *Attached by an event handler to the load event. Internal use.
+ * @private + */ + _sarissa_XMLDocument_onload = function(){ + Sarissa.__handleLoad__(this); + }; + /** + *Sets the readyState property of the given DOM Document object. + * Internal use.
+ * @private + * @argument oDoc the DOM Document object to fire the + * readystatechange event + * @argument iReadyState the number to change the readystate property to + */ + Sarissa.__setReadyState__ = function(oDoc, iReadyState){ + oDoc.readyState = iReadyState; + if (oDoc.onreadystatechange != null && typeof oDoc.onreadystatechange == "function") + oDoc.onreadystatechange(); + }; + Sarissa.getDomDocument = function(sUri, sName){ + var oDoc = document.implementation.createDocument(sUri?sUri:"", sName?sName:"", null); + oDoc.addEventListener("load", _sarissa_XMLDocument_onload, false); + return oDoc; + }; if(window.XMLDocument){ /** *Emulate IE's onreadystatechange attribute
@@ -254,16 +277,7 @@ // BTW the try>catch block is for 1.4; I haven't found a way to check if // the property is implemented without // causing an error and I dont want to use user agent stuff for that... - var _SARISSA_SYNC_NON_IMPLEMENTED = false; - try{ - /** - *Emulates IE's async property for Moz versions prior to 1.4. - * It controls whether loading of remote XML files works - * synchronously or asynchronously.
- */ - XMLDocument.prototype.async = true; - _SARISSA_SYNC_NON_IMPLEMENTED = true; - }catch(e){/* trap */}; + var _SARISSA_SYNC_NON_IMPLEMENTED = false;// ("async" in XMLDocument.prototype) ? false: true; /** *Keeps a handle to the original load() method. Internal use and only * if Mozilla version is lower than 1.4
@@ -305,50 +319,44 @@ }; return oDoc; }; - };//if(window.XMLDocument) - - /** - *Ensures the document was loaded correctly, otherwise sets the - * parseError to -1 to indicate something went wrong. Internal use
- * @private - */ - Sarissa.__handleLoad__ = function(oDoc){ - if (!oDoc.documentElement || oDoc.documentElement.tagName == "parsererror") - oDoc.parseError = -1; - Sarissa.__setReadyState__(oDoc, 4); - }; - - /** - *Attached by an event handler to the load event. Internal use.
- * @private - */ - _sarissa_XMLDocument_onload = function(){ - Sarissa.__handleLoad__(this); - }; - - /** - *Sets the readyState property of the given DOM Document object. - * Internal use.
- * @private - * @argument oDoc the DOM Document object to fire the - * readystatechange event - * @argument iReadyState the number to change the readystate property to - */ - Sarissa.__setReadyState__ = function(oDoc, iReadyState){ - oDoc.readyState = iReadyState; - if (oDoc.onreadystatechange != null && typeof oDoc.onreadystatechange == "function") - oDoc.onreadystatechange(); - }; - /** - *Factory method to obtain a new DOM Document object
- * @argument sUri the namespace of the root node (if any) - * @argument sUri the local name of the root node (if any) - * @returns a new DOM Document - */ - Sarissa.getDomDocument = function(sUri, sName){ - var oDoc = document.implementation.createDocument(sUri?sUri:"", sName?sName:"", null); - oDoc.addEventListener("load", _sarissa_XMLDocument_onload, false); - return oDoc; + + + }//if(window.XMLDocument) + else if(document.implementation && document.implementation.hasFeature && document.implementation.hasFeature('LS', '3.0')){ + Document.prototype.async = true; + Document.prototype.onreadystatechange = null; + Document.prototype.parseError = 0; + Document.prototype.load = function(sURI) { + var parser = document.implementation.createLSParser(this.async ? document.implementation.MODE_ASYNCHRONOUS : document.implementation.MODE_SYNCHRONOUS, null); + if(this.async){ + var self = this; + parser.addEventListener("load", + function(e) { + self.readyState = 4; + Sarissa.copyChildNodes(e.newDocument, self.documentElement, false); + self.onreadystatechange.call(); + }, + false); + }; + try { + var oDoc = parser.parseURI(sURI); + } + catch(e){ + this.parseError = -1; + }; + if(!this.async) + Sarissa.copyChildNodes(oDoc, this.documentElement, false); + return oDoc; + }; + /** + *Factory method to obtain a new DOM Document object
+ * @argument sUri the namespace of the root node (if any) + * @argument sUri the local name of the root node (if any) + * @returns a new DOM Document + */ + Sarissa.getDomDocument = function(sUri, sName){ + return document.implementation.createDocument(sUri?sUri:"", sName?sName:"", null); + }; }; };//if(_SARISSA_HAS_DOM_CREATE_DOCUMENT) }; @@ -356,24 +364,35 @@ // Common stuff //========================================== if(!window.DOMParser){ - /** + /* * DOMParser is a utility class, used to construct DOMDocuments from XML strings * @constructor */ DOMParser = function() { }; - /** - * Construct a new DOM Document from the given XMLstring - * @param sXml the given XML string - * @param contentType the content type of the document the given string represents (one of text/xml, application/xml, application/xhtml+xml). - * @return a new DOM Document from the given XML string - */ - DOMParser.prototype.parseFromString = function(sXml, contentType){ - var doc = Sarissa.getDomDocument(); - doc.loadXML(sXml); - return doc; + if(_SARISSA_IS_SAFARI){ + /** + * Construct a new DOM Document from the given XMLstring + * @param sXml the given XML string + * @param contentType the content type of the document the given string represents (one of text/xml, application/xml, application/xhtml+xml). + * @return a new DOM Document from the given XML string + */ + DOMParser.prototype.parseFromString = function(sXml, contentType){ + if(contentType.toLowerCase() != "application/xml"){ + throw "Cannot handle content type: \"" + contentType + "\""; + }; + var xmlhttp = new XMLHttpRequest(); + xmlhttp.open("GET", "data:text/xml;charset=utf-8," + encodeURIComponent(str), false); + xmlhttp.send(null); + return xmlhttp.responseXML; + }; + }else if(Sarissa.getDomDocument && Sarissa.getDomDocument() && "loadXML" in Sarissa.getDomDocument()){ + DOMParser.prototype.parseFromString = function(sXml, contentType){ + var doc = Sarissa.getDomDocument(); + doc.loadXML(sXml); + return doc; + }; }; - }; if(window.XMLHttpRequest){ @@ -423,16 +442,16 @@ */ Sarissa.getParseErrorText = function (oDoc){ var parseErrorText = Sarissa.PARSED_OK; - if(oDoc.parseError != 0){ + if(oDoc && oDoc.parseError && oDoc.parseError != 0){ /*moz*/ if(oDoc.documentElement.tagName == "parsererror"){ parseErrorText = oDoc.documentElement.firstChild.data; parseErrorText += "\n" + oDoc.documentElement.firstChild.nextSibling.firstChild.data; }/*konq*/ - else if(oDoc.documentElement.tagName == "html"){ - parseErrorText = Sarissa.getText(oDoc.documentElement.getElementsByTagName("h1")[0], false) + "\n"; + else{ + parseErrorText = Sarissa.getText(oDoc.documentElement);/*.getElementsByTagName("h1")[0], false) + "\n"; parseErrorText += Sarissa.getText(oDoc.documentElement.getElementsByTagName("body")[0], false) + "\n"; - parseErrorText += Sarissa.getText(oDoc.documentElement.getElementsByTagName("pre")[0], false); + parseErrorText += Sarissa.getText(oDoc.documentElement.getElementsByTagName("pre")[0], false);*/ }; }; return parseErrorText; @@ -446,8 +465,7 @@ var nodeType = node.nodeType; if(nodeType == Node.TEXT_NODE || nodeType == Node.CDATA_SECTION_NODE){ s += node.data; - } - else if(deep == true + }else if(deep == true && (nodeType == Node.ELEMENT_NODE || nodeType == Node.DOCUMENT_NODE || nodeType == Node.DOCUMENT_FRAGMENT_NODE)){ @@ -462,14 +480,21 @@ * @returns the serialized Node as an XML string */ Sarissa.serialize = function(oDoc){ - return (new XMLSerializer()).serializeToString(oDoc); + var s = null; + if(oDoc){ + s = oDoc.innerHTML?oDoc.innerHTML:(new XMLSerializer()).serializeToString(oDoc); + }; + return s; }; }else{ - if((Sarissa.getDomDocument("","foo", null)).xml){ + if(Sarissa.getDomDocument && (Sarissa.getDomDocument("","foo", null)).xml){ // see non-IE version Sarissa.serialize = function(oDoc) { - // TODO: check for HTML document and return innerHTML instead - return oDoc.xml; + var s = null; + if(oDoc){ + s = oDoc.innerHTML?oDoc.innerHTML:oDoc.xml; + }; + return s; }; /** * Utility class to serialize DOM Node objects to XML strings @@ -497,19 +522,23 @@ * @argument oNode the Node to empty */ Sarissa.clearChildNodes = function(oNode) { - while(oNode.hasChildNodes()){ + // need to check for firstChild due to opera 8 bug with hasChildNodes + while(oNode.firstChild){ oNode.removeChild(oNode.firstChild); }; }; /** *Copies the childNodes of nodeFrom to nodeTo
- *Note: The second object's original content is deleted before + *
Note: The second object's original content is deleted before * the copy operation, unless you supply a true third parameter
* @argument nodeFrom the Node to copy the childNodes from * @argument nodeTo the Node to copy the childNodes to * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is false */ Sarissa.copyChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) { + if((!nodeFrom) || (!nodeTo)){ + throw "Both source and destination nodes must be provided"; + }; if(!bPreserveExisting){ Sarissa.clearChildNodes(nodeTo); }; @@ -529,41 +558,43 @@ /** *Moves the childNodes of nodeFrom to nodeTo
- *Note: The second object's original content is deleted before + *
Note: The second object's original content is deleted before * the move operation, unless you supply a true third parameter
* @argument nodeFrom the Node to copy the childNodes from * @argument nodeTo the Node to copy the childNodes to - * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is false - */ + * @argument bPreserveExisting whether to preserve the original content of nodeTo, default is + */ Sarissa.moveChildNodes = function(nodeFrom, nodeTo, bPreserveExisting) { + if((!nodeFrom) || (!nodeTo)){ + throw "Both source and destination nodes must be provided"; + }; if(!bPreserveExisting){ Sarissa.clearChildNodes(nodeTo); }; - var nodes = nodeFrom.childNodes; // if within the same doc, just move, else copy and delete if(nodeFrom.ownerDocument == nodeTo.ownerDocument){ - nodeTo.appendChild(nodes[i]); + while(nodeFrom.firstChild){ + nodeTo.appendChild(nodeFrom.firstChild); + }; }else{ var ownerDoc = nodeTo.nodeType == Node.DOCUMENT_NODE ? nodeTo : nodeTo.ownerDocument; - if(ownerDoc.importNode && (!_SARISSA_IS_IE)) { - for(var i=0;i < nodes.length;i++) { - nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); - }; - } - else{ - for(var i=0;i < nodes.length;i++) { - nodeTo.appendChild(nodes[i].cloneNode(true)); - }; + if(ownerDoc.importNode && (!_SARISSA_IS_IE)) { + for(var i=0;i < nodes.length;i++) { + nodeTo.appendChild(ownerDoc.importNode(nodes[i], true)); + }; + }else{ + for(var i=0;i < nodes.length;i++) { + nodeTo.appendChild(nodes[i].cloneNode(true)); + }; }; Sarissa.clearChildNodes(nodeFrom); }; - }; -/** +/** *Serialize any object to an XML string. All properties are serialized using the property name
- * as the XML element name. Array elements are rendered as array-item elements,
+ * as the XML element name. Array elements are rendered as array-item elements,
* using their index/key as the value of the key attribute.
Note: Gets abused by {@code kukit.BsParser} + * + * @author Martin Heidegger + * @version 1.0 + */ +kukit.BsCommentParser = function() {} + +/** + * Removes from the content until the next end of the content. + * + * @param options parseoptions passed by {@code kukit.Parser} + */ +kukit.BsCommentParser.parse = function(options) { + var src = options.src; + var subsrc = src; + var pos = subsrc.indexOf("*/"); + var subpos = pos; + while (subsrc.charAt(subpos-1) == "\\" && subsrc.charAt(subpos-2) != "\\") { + subsrc = subsrc.substring(subpos+2); + subpos = subsrc.indexOf("*/"); + pos += subpos+2; + } + options.src = src.substring(0,options.pos)+src.substr(pos+2); +} Added: kukit/branch/plugin/kukit/kukit.BsMethodParser.js ============================================================================== --- (empty file) +++ kukit/branch/plugin/kukit/kukit.BsMethodParser.js Sun Apr 30 23:46:41 2006 @@ -0,0 +1,54 @@ +/** + * {@code kukit.BsMethodParser} parses a method as property value for {@code kukit.BsPropertyParser}. + * + *
Note: Gets abused by {@code kukit.BsParser} + * + * @author Martin Heidegger + * @version 1.0 + */ +kukit.BsMethodParser = function(){} + +/** + * Central parsing method + * + * @param options parseoptions passed by {@code kukit.Parser} + */ +kukit.BsMethodParser.parse = function(options) { + var methodName = options.src.substring(0,options.pos); + var value = [methodName]; + var properties = options.src.substring(options.pos+1); + parseoptions = kukit.Parser.parse(this, properties, value, this.parseSettings); + options.result.push(value); + options.src = parseoptions.src; +} + +/** + * Handles if the end of the property "," occurs. + * + * @param options parseoptions passed by {@code kukit.Parser} + */ +kukit.BsMethodParser.parsePropertyEnd = function(options) { + var name = kukit.Utils.trim(options.src.substring(0,options.pos)); + if (name != "") + options.result.push(name); + options.src = options.src.substring(options.pos+1); +} + +/** + * Handles if the end of the method occus. + * + * @param options parseoptions passed by {@code kukit.Parser} + */ +kukit.BsMethodParser.parseEnd = function(options) { + this.parsePropertyEnd(options); + options.exit = 0; +} + +// Settings for the method block parsing +kukit.BsMethodParser.parseSettings = { + "}": kukit.Parser.parserError("Method needs to be closed by )"), + "\"": kukit.BsStringParser.parse, + "/*": kukit.BsCommentParser.parse, + ",": kukit.BsMethodParser.parsePropertyEnd, + ")": kukit.BsMethodParser.parseEnd +} \ No newline at end of file Modified: kukit/branch/plugin/kukit/kukit.BsParser.js ============================================================================== --- kukit/branch/plugin/kukit/kukit.BsParser.js (original) +++ kukit/branch/plugin/kukit/kukit.BsParser.js Sun Apr 30 23:46:41 2006 @@ -1,113 +1,151 @@ -Object.prototype.toString = function() { - var result = "{"; - for (var i in this) { - result += i+":"+this[i]+", "; - } - return result.substring(0,result.length-2)+"}"; -} - -Array.prototype.toString = function() { - var result = "["; - for (var i in this) { - result += this[i]+", "; - } - return result.substring(0,result.length-2)+"]"; -} - -if (typeof kukit == "undefined") { - kukit = {}; -} -kukit.BsParser = function() { -}; +/** + * {@code BsParser} is a Parser that parses any bs string. + * + *
BS stands for "Behaviour Sheet" and is ment as format for defining + * behaviors to bind logic with html elements like css is bind styles with html + * elements. + * + *
{@code BsParser} is written to parse the CSS syntax and create a object + * model. To invoke the BsParser you just need to call: + * {@code kukit.BsParser.parse("...")} + * + *
{@code BsParser} is based on {@link kukit.Parser} mechianisms. This requires + * to have parser settings that are defined at the end of the file and refer to + * certain sub-parsermethods. + * + *
Example:
+ * {@code BsParser} would transform this css sytax:
+ *
+ * myselector:mytype(typearg,typearg) {
+ * property: value1 value2 value3(valuearg, valuearg);
+ * anotherproperty: "value with space";
+ * }
+ *
+ *
+ * Javascript Object
+ *
+ * {
+ * myselector: {
+ * selector: myselector,
+ * type: {
+ * name: "mytype",
+ * properties: ["typearg", "typearg"]
+ * }
+ * properties: {
+ * property: [
+ * "value1",
+ * "value2",
+ * ["value3", "valuearg", "valuearg"]
+ * ],
+ * anotherproperty: [
+ * "value with space"
+ * ]
+ * }
+ * }
+ * }
+ *
+ *
+ *
If you define the same selector and type (including arguments) it combines
+ * all together to one property information like:
+ *
+ * BehaviorSheet
+ * This is a subparser method for properties.
+ *
+ * @param options parseoptions passed by {@code kukit.Parser}
+ */
+kukit.BsPropertyParser.parseNextProperty = function(options) {
+ this.addProperty(options, options.src.substring(0,options.pos));
+ options.src = options.src.substring(options.pos+1);
+}
+
+/**
+ * Ends the processing of a block
+ *
+ * This is a subparser method for properties.
+ *
+ * @param options parseoptions passed by {@code kukit.Parser}
+ */
+kukit.BsPropertyParser.parsePropertyBlockEnd = function(options) {
+ this.addProperty(options, options.src.substring(0,options.pos));
+ options.src = options.src.substring(options.pos);
+ options.exit = 0;
+}
+
+/**
+ * Finishes the processing of any property.
+ *
+ * @param options parseoptions passed by {@code kukit.Parser}
+ */
+kukit.BsPropertyParser.parsePropertyEnd = function(options) {
+ this.parseNextProperty(options);
+ options.exit = 0;
+}
+
+/**
+ * Helper for adding a property to the result.
+ *
+ * @param options parseoptions passed by {@code kukit.Parser}
+ * @param property property
+ */
+kukit.BsPropertyParser.addProperty = function(options, property) {
+ property = this.checkProperty(property);
+ if (property != "")
+ options.result.push(property);
+}
+
+/**
+ * Validates if a property matches all states.
+ *
+ * @param options parseoptions passed by {@code kukit.Parser}
+ * @param property property
+ */
+kukit.BsPropertyParser.checkProperty = function(property) {
+ property = kukit.Utils.trim(property);
+ property = property.split("\\n").join("\n");
+ property = property.split("\\t").join("\t");
+ property = property.split("\\b").join("\b");
+ property = property.split("\\b").join("\b");
+ return property;
+}
+
+// Settings for the property parsing
+kukit.BsPropertyParser.parseSettings = {
+ "(": kukit.Utils.cachedCall(kukit.BsMethodParser, "parse"),
+ "\"": kukit.BsStringParser.parse,
+ "/*": kukit.BsCommentParser.parse,
+ " ": kukit.BsPropertyParser.parseNextProperty,
+ ";": kukit.BsPropertyParser.parsePropertyEnd,
+ "}": kukit.BsPropertyParser.parsePropertyBlockEnd
+}
\ No newline at end of file
Added: kukit/branch/plugin/kukit/kukit.BsSelector.js
==============================================================================
--- (empty file)
+++ kukit/branch/plugin/kukit/kukit.BsSelector.js Sun Apr 30 23:46:41 2006
@@ -0,0 +1,38 @@
+/**
+ * {@code BsSelector} is a data holder for the informations including its (pseudo)class called "type"
+ *
+ * @author Martin Heidegger
+ * @version 1.0
+ */
+kukit.BsSelector = function() {
+ this.properties = {}; // properties for the type
+ this.type = {}; // type informations
+ this.selector = " This method is important for identifing a certain selector including
+ * its method informations.
+ *
+ * @return selector as string
+ */
+kukit.BsSelector.prototype.id = function() {
+ var result = this.selector;
+
+ with (this.type) {
+ if (typeof name != "undefined") {
+ result += ":"+name+"(";
+ if (typeof properties != "undefined") {
+ for (var i=0; i< properties.length; i++) {
+ if (i != 0)
+ result += ",";
+ result += properties[i];
+ }
+ }
+ result += ")";
+ }
+ }
+
+ return result;
+}
\ No newline at end of file
Added: kukit/branch/plugin/kukit/kukit.BsStringParser.js
==============================================================================
--- (empty file)
+++ kukit/branch/plugin/kukit/kukit.BsStringParser.js Sun Apr 30 23:46:41 2006
@@ -0,0 +1,33 @@
+/**
+ * {@code kukit.BsStringParser} handles the parsing of a string value
+ *
+ * If you set a value with " you need to have different parsing.
+ *
+ * @author Martin Heidegger
+ * @version 1.0
+ */
+kukit.BsStringParser = function() {}
+
+/**
+ * Removes the doublequotes and adds the content to the passed-in result.
+ *
+ * @param options parseoptions passed by {@code kukit.Parser}
+ */
+kukit.BsStringParser.parse = function(options) {
+ var content = "";
+ var src = options.src.substring(options.pos+1);
+ var pos = src.indexOf("\"");
+ while (pos >= 0) {
+ content = src.substring(0, pos);
+ src = src.substring(pos+1);
+
+ // Handle escaping of the doublequotes
+ if (src.charAt(pos-1) != "\\" || src.charAt(pos-2) != "\\") {
+ break;
+ }
+ content += "\"";
+ pos = src.indexOf("\"");
+ }
+ options.src = options.src.substring(0, options.pos)+options.src.substring(options.pos+content.length+2);
+ options.result.push(kukit.BsPropertyParser.checkProperty(content));
+}
Modified: kukit/branch/plugin/kukit/kukit.Parser.js
==============================================================================
--- kukit/branch/plugin/kukit/kukit.Parser.js (original)
+++ kukit/branch/plugin/kukit/kukit.Parser.js Sun Apr 30 23:46:41 2006
@@ -1,58 +1,90 @@
-if(typeof kukit == "undefined") {
- kukit = {};
-}
-kukit.Parser = function() {
-}
+/**
+ * {@code kukit.Parser} is the core parser to be used by {@link kukit.BsParser}.
+ *
+ * {@code kukit.Parser} provides a generic way of parsing text by taking
+ * parseMethods registered to characters. If one of the registered characters
+ * occurs it calls the related method together with a parsing scope.
+ *
+ * The parsing scope contains the result and the rest of the remaining stuff
+ * to parse the code.
+ *
+ * @author Martin Heidegger
+ * @version 1.0
+ */
+kukit.Parser = function() {}
-kukit.Parser.trim = function(str, chars) {
- if (!chars)
- chars='\\s\\n\\r'
- return str.replace(new RegExp("^["+chars+"]*(.*?)["+chars+"]*$"), "$1");
-}
+/**
+ * Parses a certain source.
+ *
+ * @param scope scope where the subparsers will be executed
+ * @param src src that should be parsed
+ * @param result result that can be accessed by each subparser
+ * @subparsers map of subparsers mapped to characters
+ * @return options to be used during execution (containing the rest string in .src)
+ */
kukit.Parser.parse = function(scope, src, result, subparsers) {
- //print("parsing "+src);
var options = {scope: scope, src:src, result:result, subparsers:subparsers, exit: -1};
- while (this.getNext(options) && options.exit == -1);
- //print("end of parsing");
+ while (this.nextStep(options) && options.exit == -1);
return options;
}
+
+// List of errors that occured
kukit.Parser.errors = {};
-kukit.Parser.parserError = function(error) {
- errormethod = this.errors[error];
- if (!errormethod) {
- errormethod = function(options) {
- options.error = error;
- options.exit = 1;
- }
- }
- return errormethod;
-}
-kukit.Parser.getNext = function(options) {
+
+/**
+ * Executes the next step of parsing.
+ *
+ * @param options options for all
+ * @return true if it could find something to parse
+ */
+kukit.Parser.nextStep = function(options) {
+
+ // Take the next matching subparser by its identifier
var next = -1;
var parser;
var parsername;
- //print("> state"+options.exit);
for (var i in options.subparsers) {
var pos = options.src.indexOf(i);
- //print("> taking parser for "+i+" at "+pos+" next is "+next);
if ((pos < next || next == -1) && pos != -1) {
next = pos;
parsername = i;
- //print(">> found "+i+" at "+pos);
parser = options.subparsers[i];
}
}
options.pos = next;
+
+ // Execute the parser to the scope
if (parser) {
- //print(">> found "+parsername+" for "+options.src+" function "+parser);
- options.scope["__parseMethod"]= parser;
+ var n = "__parserMethod__"
+ options.scope[n] = parser;
try {
- options.scope["__parseMethod"](options);
- } catch(e) {
+ options.scope[n](options);
+ } catch(e) {
options.error = e;
options.exit = 2;
print(e);
}
+ } else if(next >= 0) {
+ options.error = "Parser for > "+parsername+" < not found";
+ options.exit = 2;
+ print(options.error);
}
return (next >=0);
+}
+
+/**
+ * Util that exits parsing with a error if a character occurs.
+ *
+ * @param error Error that should be set if a character occurs
+ * @return parser-method to be integrated into the parser
+ */
+kukit.Parser.parserError = function(error) {
+ errormethod = this.errors[error];
+ if (!errormethod) {
+ errormethod = function(options) {
+ options.error = error;
+ options.exit = 1;
+ }
+ }
+ return errormethod;
}
\ No newline at end of file
Added: kukit/branch/plugin/kukit/kukit.Utils.js
==============================================================================
--- (empty file)
+++ kukit/branch/plugin/kukit/kukit.Utils.js Sun Apr 30 23:46:41 2006
@@ -0,0 +1,45 @@
+// Namespace declarations
+kukit = {};
+
+/**
+ * Collection of utils for kukit.
+ *
+ * @author Martin Heidegger
+ * @version 1.0
+ */
+kukit.Utils = function() {}
+
+/**
+ * Creates a function that executes a method inside a scope and stores it.
+ *
+ * In different to other scope keeper implementations, this implementation
+ * stores the method call in a field so its not recreated again and again.
+ *
+ * @todo integrate generic call (currently only one arguments is supported)
+ *
+ * @param scope Scope of the method call
+ * @param methodName Name of the method in the scope
+ * @return
+ */
+kukit.Utils.cachedCall = function(scope, methodName) {
+ var method = scope[methodName+"_ref"];
+ if (!method) {
+ method = scope[methodName+"_ref"] = function(options) {
+ return scope.parse(options);
+ }
+ }
+ return method;
+}
+
+/**
+ * Trims a string.
+ *
+ * @param str String to be trimmed
+ * @param chars Characters that should be trimmed
+ * @return Trimmed string
+ */
+kukit.Utils.trim = function(str, chars) {
+ if (!chars)
+ chars='\\s\\n\\r'
+ return str.replace(new RegExp("^["+chars+"]*(.*?)["+chars+"]*$"), "$1");
+}
\ No newline at end of file
Modified: kukit/branch/plugin/tests.bat
==============================================================================
--- kukit/branch/plugin/tests.bat (original)
+++ kukit/branch/plugin/tests.bat Sun Apr 30 23:46:41 2006
@@ -1 +1 @@
-java -cp ../rhino1_6R2/js.jar org.mozilla.javascript.tools.shell.Main -f tests/ecmaunit.js -f kukit/kukit.Parser.js -f kukit/kukit.BsParser.js -f kukit/kukit.BsParserSelectorElement.js -f tests/kukit.BsParserTestCase.js -f tests/runtests.js
\ No newline at end of file
+java -cp ../rhino1_6R2/js.jar org.mozilla.javascript.tools.shell.Main -f tests/ecmaunit.js -f kukit/kukit.Utils.js -f kukit/kukit.Parser.js -f kukit/kukit.BsStringParser.js -f kukit/kukit.BsCommentParser.js -f kukit/kukit.BsMethodParser.js -f kukit/kukit.BsPropertyParser.js -f kukit/kukit.BsParser.js -f tests/kukit.BsParserTestCase.js -f kukit/kukit.BsSelector.js -f tests/runtests.js
Modified: kukit/branch/plugin/tests/kukit.BsParserTestCase.js
==============================================================================
--- kukit/branch/plugin/tests/kukit.BsParserTestCase.js (original)
+++ kukit/branch/plugin/tests/kukit.BsParserTestCase.js Sun Apr 30 23:46:41 2006
@@ -43,9 +43,11 @@
}
this.testComments = function() {
- var src = "tagselector{\n /* comment */\n key:value;\n}\n\n/* comment outside */\n";
+ var src = "tag{\n /* comment\\*/key2:value; */\n key:value;\n}\n\n/* comment outside */\n";
var rules = kukit.BsParser.parse(src);
- this.assertTrue("tagselector" in rules);
+ this.assertTrue("tag" in rules);
+ this.assertEquals(rules["tag"].properties["key"][0], "value");
+ this.assertFalse("key2" in rules["tag"].properties);
}
this.testMultilineComments = function() {
Modified: kukit/branch/plugin/tests/runtests.js
==============================================================================
--- kukit/branch/plugin/tests/runtests.js (original)
+++ kukit/branch/plugin/tests/runtests.js Sun Apr 30 23:46:41 2006
@@ -18,6 +18,7 @@
var reporter = new StdoutReporter;
var testsuite = new TestSuite(reporter);
testsuite.registerTest(kukit.BsParserTestCase);
+ //testsuite.registerTest(kukit.RuleProcessorTestCase);
testsuite.runSuite();
};
+ * tag {
+ * key1: value;
+ * }
+ * tag {
+ * key2: value;
+ * }
+ *
+ *
+ * JavaScript Object
+ *
+ * {
+ * tag: {
+ * key1: "value",
+ * key2: "value"
+ * }
+ * }
+ *
+ *
+ * @see kukit.Parser.parse
+ * @author Martin Heidegger
+ * @version 1.0
+ */
+kukit.BsParser = function() {};
+/**
+ * Parses a BS string
+ *
+ * @param src source to be parsed
+ */
kukit.BsParser.parse = function(src) {
- //print("parsing "+src);
var result = {};
+ // Base parsing should just recognize each block
kukit.Parser.parse(this, src, result, {
"{": this.parseBlock,
- "/*": this.parseComments
+ "/*": kukit.BsCommentParser.parse // integrated without scope insurance
+ // for perfomance saving
});
-
- //print("result: "+result);
return result;
}
+
+// Definitions of white spaces to be ignored
kukit.BsParser.WHITE_SPACES = " \t";
+
+/**
+ * Removes unnecessary white spaces inside the block content.
+ *
+ * @param options parseoptions passed by {@code kukit.Parser}
+ */
kukit.BsParser.parseWhiteSpaces = function(options) {
var src = options.src.substring(options.pos);
- //print("-/ remove space before: "+src);
var whitespaces = this.WHITE_SPACES;
while (whitespaces.indexOf(src.charAt(0)) != -1) {
src = src.substr(1);
- //print(" new src: "+src);
}
options.src = options.src.substring(0, options.pos)+src;
- //print("-/ remove space after: "+src);
}
-kukit.BsParser.parseComments = function(options) {
- var src = options.src;
- var pos = src.indexOf("*/");
- //print("-/ remove comment before: "+src);
- options.src = src.substring(0,options.pos)+src.substr(pos+2);
- //print("-/ remove comment after: "+options.src);
+/**
+ * Handles the end of a block
+ *
+ * @param options parseoptions passed by {@code kukit.Parser}
+ */
+kukit.BsParser.parseBlockEnd = function(options) {
+ options.src = options.src.substring(options.pos+1);
+ options.exit = 0;
}
+
+/**
+ * Parses the selector and passes the block content to certain sub parsers.
+ *
+ * @param options parseoptions passed by {@code kukit.Parser}
+ */
kukit.BsParser.parseBlock = function(options) {
var src = options.src;
var rawselectors = src.substring(0, options.pos).split(",");
var selectors = {};
+
+ // Formatting the selector and register them
for (var i=0; i