Changeset de5a7dd in tol

Timestamp:

Oct 26, 2008, 10:31:06 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

8958dab

Parents:

82ef353

Message:

Adding optional tags $BEGIN and $END

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@77 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/vmatrix_type/vmat_bsr.cpp (modified) (6 diffs)

tol/btol/vmatrix_type/vmat_bsr.cpp

@@ -864 +864 @@
 
 vector<noise_info>*  assign_noise_to_term::noise_vec_   = NULL;
-symbols<int>*          assign_noise_to_term::noise_table_ = NULL;
-lin_reg_equation*      assign_noise_to_term::equ_       = NULL;
-vector<sigma_info>*    assign_noise_to_term::sig_vec_   = NULL;
+symbols<int>*        assign_noise_to_term::noise_table_ = NULL;
+lin_reg_equation*    assign_noise_to_term::equ_         = NULL;
+vector<sigma_info>*  assign_noise_to_term::sig_vec_     = NULL;
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -1106 +1106 @@
   int numEqu_;
 
+  bool endFound_;
 
   bys_sparse_reg()
   : Xnzmax_  (0),
     Anzmax_  (0),
-    numEqu_  (0)
+    numEqu_  (0),
+    endFound_ (false)
   {
     var.count = 0;
@@ -1150 +1152 @@
       model_nameDef, model_descriptionDef, 
       session_nameDef, session_descriptionDef, session_authorDef, 
-      problem;
+      explicit_begin, explicit_end, problem;
 
     definition(const bys_sparse_reg& s_)
@@ -1700 +1702 @@
         error_SessionAuthorDefExpected
         ;
-
+      explicit_begin = str_p("$BEGIN"); 
+      explicit_end   = str_p("$END")[assign_a(s.endFound_,true)]; 
       problem = 
+        (explicit_begin | eps_p) >>
         //header
         (
@@ -1718 +1722 @@
            inequation ) >>
         //end
-        (end_p | error_declarationExpected )
+        (explicit_end | end_p | error_declarationExpected )
         ;
       //BOOST_SPIRIT_DEBUG_NODE(argumentSeparator );
@@ -2100 +2104 @@
   Std(BSR()+"Parsing BSR file "+fName+" with "+(int)bsr.fileSize+" bytes\n");
   parse_info<iterator_t> result = parse(begin, end, bsr, skip);
-  if(!result.full)
+  if(!result.full && !bsr.endFound_)
   {
     BText msg = BSR() + BText(fName) + " Fails Parsing\n"+url_parse_bsr();