Changeset 136 for trunk/src

Timestamp:

May 6, 2008, 2:18:45 PM (11 years ago)

Author:

lindanl

Message:

New end tag checking for validation mode.

Location:

trunk/src

Files:

• engine.c (modified) (19 diffs)
• engine.h (modified) (1 diff)

trunk/src/engine.c

@@ -839 +839 @@
 inline void ParsingEngine<C>::ParseContent() {
         DocumentStart_action(); 
-        vector<int> elemStack;
-        int elemID;
         bool is_emptyStartTag = false;
         do {
@@ -852 +850 @@
                         text_if_nonnull_action();
                         Parse_StartTag();
-//                      elemID = Parse_ValidStartTag(is_emptyStartTag);
-//                      if(!is_emptyStartTag)
-//                              elemStack.push_back(elemID);
-//                      else 
-//                              is_emptyStartTag = false;
                 }
                 else if (at_EndTag_Start<C>(cur())) {
                         text_if_nonnull_action();
                         Parse_EndTag();
-//                      elemID = Parse_ValidEndTag();
-//                      if (elemStack.size()<= 0 || elemID != elemStack[elemStack.size()-1])
-//                              Syntax_Error(NT_ETag);
-//                      else
-//                              elemStack.pop_back();
                 }
                 else if (at_Comment_Start<C>(cur())) {
@@ -950 +938 @@
         
         if (AtChar<C,'>'>(cur())){
-                Advance(1);    
-                int rootID = model_info->GlobalElementTable[nameID];
+                Advance(1);  
 
                 CRE_Seq * rslt = new CRE_Seq();
-                rslt->subCMs.push_back(new CRE_Name(rootID));
+                rslt->subCMs.push_back(new CRE_Name(nameID));
                 CM_RegExp * cre = new CM_RegExp();
                 cre->content_re = rslt;         
@@ -1139 +1126 @@
         Advance(5);
         cm = new CM_Empty();
-        model_info->ContentModelData[elemID] = cm;
+        model_info->ContentModelData[nameID] = cm;
         }
     else if (at_ANY<C>(cur())) {
         Advance(3);
         cm = new CM_Any();
-        model_info->ContentModelData[elemID] = cm;
+        model_info->ContentModelData[nameID] = cm;
     }
     else {
@@ -1152 +1139 @@
                 if (at_PCDATA<C>(cur())){
                         cm = Parse_RemainingMixed();
-                        model_info->ContentModelData[elemID] = cm;
+                        model_info->ContentModelData[nameID] = cm;
                 }
                 else{
@@ -1172 +1159 @@
                         cre -> transition_map = transition_map;
                         
-                        model_info->ContentModelData[elemID] = cre;
+                        model_info->ContentModelData[nameID] = cre;
                         cm = cre;
                 }                       
@@ -1204 +1191 @@
                         ScanTo(NonWS);
                         int nameID = Parse_Name();
-                        int elemID = model_info->getOrInsertGlobalElement(nameID);
-                        r->elements[elemID] = ++k;
+                        r->elements[nameID] = ++k;
                         ScanTo(NonWS);
                 }
@@ -1294 +1280 @@
         else{
                 int nameID = Parse_Name();
-                int elemID = model_info->getOrInsertGlobalElement(nameID);
-                CRE_Name * r = new CRE_Name(elemID);
+                CRE_Name * r = new CRE_Name(nameID);
 
                 if (AtChar<C,'?'>(cur())) {
@@ -1841 +1826 @@
 }
 
-template <CodeUnit_Base C>
-inline int ParsingEngine<C>::Parse_ValidEndTag() {
-        Advance(2); /* Skip "</". */
-        
-        
-        int nameID = Parse_Name();  
-        int elemID = model_info->GlobalElementTable[nameID];
-        if(elemID==0)
-                        Validity_Error(vErr_elementvalid);
-                        
-        if (AtChar<C,'>'>(cur())) {
-                Advance(1);
-                EndTag_action(GetCodeUnitPtr(text_or_markup_start), LengthFrom(text_or_markup_start));
-        }
-    else {
-                ScanTo(NonWS);
-                if (AtChar<C,'>'>(cur())) {
-                        Advance(1);
-                        EndTag_action(GetCodeUnitPtr(text_or_markup_start), LengthFrom(text_or_markup_start));
-                }
-                else Syntax_Error(NT_ETag);
-    }
-    return elemID;
-}
 /* Parse a valid start or empty element tag. */
 template <CodeUnit_Base C>
@@ -1970 +1931 @@
                 } while (1);
         }
-        return elemID;
+        return nameID;
 }
 
@@ -1976 +1937 @@
 inline int ParsingEngine<C>::Parse_ValidElement() {
         bool is_emptyStartTag = false;
-        int elemID = Parse_ValidStartTag(is_emptyStartTag);
+        int nameID = Parse_ValidStartTag(is_emptyStartTag);
 #ifdef DEBUG
-        printf("Parse_ValidElement: elemID = %d, is_emptyStartTag=%i\n",elemID, is_emptyStartTag);
+        printf("Parse_ValidElement: nameID = %d, is_emptyStartTag=%i\n",nameID, is_emptyStartTag);
 #endif
-        ContentModel * cm = model_info->ContentModelData[elemID];
+        ContentModel * cm = model_info->ContentModelData[nameID];
         switch (cm->cm_type) {
                 case cm_Empty:
                         if (!is_emptyStartTag) {
                                 if (at_EndTag_Start<C>(cur())) {
-                                        if (Parse_ValidEndTag()!=elemID) Validity_Error(vErr_elementvalid);
-//                                      Parse_EndTag();
+                                        Parse_WF_EndTag(nameID);
                                 }
                                 else {
@@ -1996 +1956 @@
                         if (!is_emptyStartTag) {
                                 Parse_AnyContent();
-                                if (Parse_ValidEndTag()!=elemID) Validity_Error(vErr_elementvalid);
+                                Parse_WF_EndTag(nameID);
                         }
                         break;
@@ -2002 +1962 @@
                         if (!is_emptyStartTag) {
                                 Parse_MixedContent(((CM_Mixed *) cm)->elements);
-                                if (Parse_ValidEndTag()!=elemID) Validity_Error(vErr_elementvalid);
+                                Parse_WF_EndTag(nameID);
                         }
                         break;
@@ -2010 +1970 @@
                         if (!is_emptyStartTag) {
                                 content_state = Parse_ValidContent(cre);
-                                if (Parse_ValidEndTag()!=elemID) Validity_Error(vErr_elementvalid);                     
+                                Parse_WF_EndTag(nameID);                
                         }
                         if (cre->transition_map[content_state][0]==0) {
@@ -2016 +1976 @@
                         }
         }
-        return elemID;
+        return nameID;
 }
 
@@ -2030 +1990 @@
                 }
                 else if (at_ElementTag_Start<C>(cur())) {
-                        int elemID = Parse_ValidElement();
+                        int nameID = Parse_ValidElement();
 #ifdef DEBUG
                         printf("Content model state transition %i", cur_state);
 #endif
-                        cur_state = cre->transition_map[cur_state][elemID];
+                        cur_state = cre->transition_map[cur_state][nameID];
 #ifdef DEBUG
                         printf("-> %i\n", cur_state);
@@ -2069 +2029 @@
                 if (at_ElementTag_Start<C>(cur())) {
                         text_if_nonnull_action();
-                        int elemID = Parse_ValidElement();
+                        int nameID = Parse_ValidElement();
                 }
                 else if (at_EndTag_Start<C>(cur())) {
@@ -2124 +2084 @@
                 if (at_ElementTag_Start<C>(cur())) {
                         text_if_nonnull_action();
-                        int elemID = Parse_ValidElement();
-                        if (elems[elemID] == 0) {
+                        int nameID = Parse_ValidElement();
+                        if (elems[nameID] == 0) {
                                 Validity_Error(vErr_elementvalid);
                         }
@@ -2188 +2148 @@
 inline void ParsingEngine<C>::Parse_DocumentContent() {
 #ifdef VALIDATION
+        printf("Validation Mode On!\n");
         int final_state = Parse_ValidContent(model_info->rootModel);
         if (model_info->rootModel->transition_map[final_state][0]==0) {

trunk/src/engine.h

@@ -139 +139 @@
         
         int Parse_ValidStartTag(bool& is_empty);
-        int Parse_ValidEndTag();        
         
         int Parse_Name();