From 2317a2b102ecbe2bff9cabbfea7eb469c13f4f58 Mon Sep 17 00:00:00 2001
From: Borza Viktor <viktor.borza@jaydata.org>
Date: Thu, 6 Sep 2012 10:35:32 +0200
Subject: [PATCH] ADD: endElmenetInline, short end for xml element

---
 src/genx.cc   | 102 +++++++++++++++++++++++++++++++++++++++++++++++++-
 src/genx.h    |   1 +
 src/writer.cc |  15 ++++++++
 src/writer.h  |   3 ++
 4 files changed, 119 insertions(+), 2 deletions(-)

diff --git a/src/genx.cc b/src/genx.cc
index c8e4f3a..41f9878 100644
--- a/src/genx.cc
+++ b/src/genx.cc
@@ -1136,7 +1136,7 @@ genxStatus genxStartDocSender(genxWriter w, genxSender * sender)
  *  we build it, then as each attribute is added, we fill in its value and
  *  mark the fact that it's been added, in the "provided" field.
  */
-static genxStatus writeStartTag(genxWriter w)
+static genxStatus writeStartTag(genxWriter w, bool inlineTag = 0)
 {
   int i;
   genxAttribute * aa = (genxAttribute *) w->attributes.pointers;
@@ -1181,7 +1181,7 @@ static genxStatus writeStartTag(genxWriter w)
       SendCheck(w, "\"");
     }
   }
-  SendCheck(w, ">");
+  if (!inlineTag) SendCheck(w, ">");
   return GENX_SUCCESS;
 }
 
@@ -1605,6 +1605,104 @@ genxStatus genxEndElement(genxWriter w)
 
   return GENX_SUCCESS;
 }
+genxStatus genxEndElementInline(genxWriter w)
+{
+  genxElement e;
+  int i;
+
+  switch (w->sequence)
+  {
+  case SEQUENCE_NO_DOC:
+  case SEQUENCE_PRE_DOC:
+  case SEQUENCE_POST_DOC:
+    return w->status = GENX_SEQUENCE_ERROR;
+  case SEQUENCE_START_TAG:
+  case SEQUENCE_ATTRIBUTES:
+    if ((w->status = writeStartTag(w, 1)) != GENX_SUCCESS)
+      return w->status;
+    break;
+  case SEQUENCE_CONTENT:
+    break;
+  }
+
+  /*
+   * first peek into the stack to find the right namespace declaration
+   *  (if any) so we can properly prefix the end-tag.  Have to do this
+   *  before unwinding the stack because that might reset some xmlns
+   *  prefixes to the context in the parent element
+   */
+  for (i = w->stack.count - 1; w->stack.pointers[i] != NULL; i -= 2)
+    ;
+  e = (genxElement) w->stack.pointers[--i];
+
+  /*SendCheck(w, "</");
+  if (e->ns && e->ns->declaration != w->xmlnsEquals)
+  {
+    SendCheck(w, e->ns->declaration->name + STRLEN_XMLNS_COLON);
+    SendCheck(w, ":");
+  }
+  SendCheck(w, e->type);*/
+  SendCheck(w, " />");
+
+  /*
+   * pop zero or more namespace declarations, then a null, then the
+   *  start-element declaration off the stack
+   */
+  w->stack.count--;
+  while (w->stack.pointers[w->stack.count] != NULL)
+  {
+    genxNamespace ns = (genxNamespace) w->stack.pointers[--w->stack.count];
+    w->stack.count--; /* don't need decl */
+
+    /* if not a fake unset-default namespace */
+    if (ns)
+    {
+      /*
+       * if they've stupidly jammed in their own namespace-prefix
+       *  declarations, we have to go looking to see if there's another
+       *  one in effect
+       */
+      if (ns->baroque)
+      {
+	i = w->stack.count;
+	while (i > 0)
+	{
+	  while (w->stack.pointers[i] != NULL)
+	  {
+	    genxAttribute otherDecl = (genxAttribute) w->stack.pointers[i--];
+	    genxNamespace otherNs = (genxNamespace) w->stack.pointers[i--];
+	    
+	    if (otherNs == ns)
+	    {
+	      ns->declaration = otherDecl;
+	      i = 0;
+	      break;
+	    }
+	  }
+	  
+	  /* skip NULL & element */
+	  i -= 2;
+	}
+      }
+      ns->declCount--;
+      if (ns->declCount == 0)
+	ns->baroque = False;
+    }
+  }
+
+  /* pop the NULL */
+  --w->stack.count;
+  if (w->stack.count < 0)
+    return w->status = GENX_NO_START_TAG;
+
+  if (w->stack.count == 0)
+    w->sequence = SEQUENCE_POST_DOC;
+  else
+    w->sequence = SEQUENCE_CONTENT;
+
+  return GENX_SUCCESS;
+}
+
 
 /*
  * Internal character-adder.  It tries to keep the number of sendx()
diff --git a/src/genx.h b/src/genx.h
index a5c34f9..6e07f5d 100644
--- a/src/genx.h
+++ b/src/genx.h
@@ -222,6 +222,7 @@ genxStatus genxUnsetDefaultNamespace(genxWriter w);
  * Write an end tag
  */
 genxStatus genxEndElement(genxWriter w);
+genxStatus genxEndElementInline(genxWriter w);
 
 /*
  * Write some text
diff --git a/src/writer.cc b/src/writer.cc
index 6b86fdd..8380275 100644
--- a/src/writer.cc
+++ b/src/writer.cc
@@ -63,6 +63,7 @@ void Writer::Initialize(Handle<Object> target)
   NODE_SET_PROTOTYPE_METHOD(t, "addAttributeLiteral", AddAttributeLiteral);
 
   NODE_SET_PROTOTYPE_METHOD(t, "endElement", EndElement);
+  NODE_SET_PROTOTYPE_METHOD(t, "endElementInline", EndElementInline);
 
   target->Set(String::NewSymbol("Writer"), t->GetFunction());
 
@@ -572,6 +573,20 @@ genxStatus Writer::endElement()
   return genxEndElement(writer);
 }
 
+Handle<Value> Writer::EndElementInline(const Arguments& args)
+{
+  HandleScope scope;
+  Writer* w = ObjectWrap::Unwrap<Writer>(args.This());
+
+  w->endElementInline();
+  return args.This();
+}
+
+genxStatus Writer::endElementInline()
+{
+  return genxEndElementInline(writer);
+}
+
 utf8 Writer::createUtf8FromString(Handle<String> String)
 {
   utf8 string = NULL;
diff --git a/src/writer.h b/src/writer.h
index 77c6a3f..c6187cd 100644
--- a/src/writer.h
+++ b/src/writer.h
@@ -95,6 +95,9 @@ class Writer: public ObjectWrap
   static Handle<Value> EndElement(const Arguments& args);
   genxStatus endElement();
 
+  static Handle<Value> EndElementInline(const Arguments& args);
+  genxStatus endElementInline();
+
 private:
   static utf8 createUtf8FromString(Handle<String> String);