From be47ce03fbbbd41e0f91853b0a66906b80e0647c Mon Sep 17 00:00:00 2001
From: vdhoeven <vdhoeven@64cb5145-927a-446d-8aed-2fb7b4773692>
Date: Mon, 11 Jan 2010 19:47:34 +0000
Subject: [PATCH] Fix typo

git-svn-id: svn://svn.savannah.gnu.org/texmacs/trunk@2912 64cb5145-927a-446d-8aed-2fb7b4773692
---
 src/src/Kernel/Containers/ntuple.hpp |  2 +-
 src/src/System/Language/grammar.cpp  | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/src/Kernel/Containers/ntuple.hpp b/src/src/Kernel/Containers/ntuple.hpp
index e1d205e1..5bd08cca 100644
--- a/src/src/Kernel/Containers/ntuple.hpp
+++ b/src/src/Kernel/Containers/ntuple.hpp
@@ -65,7 +65,7 @@ public:
   T1 x1; T2 x2; T3 x3; T4 x4;
   inline quartet (const quartet& q):
     x1 (q.x1), x2 (q.x2), x3 (q.x3), x4 (q.x4) {}
-  inline quartet (const T1& y1, const T2& y2, const T3& y3, const T3& y4):
+  inline quartet (const T1& y1, const T2& y2, const T3& y3, const T4& y4):
     x1 (y1), x2 (y2), x3 (y3), x4 (y4) {}
   inline quartet& operator = (const quartet& q) {
     x1= q.x1; x2= q.x2; x3= q.x3; x4= q.x4; return *this; }
diff --git a/src/src/System/Language/grammar.cpp b/src/src/System/Language/grammar.cpp
index 825e6577..102d100d 100644
--- a/src/src/System/Language/grammar.cpp
+++ b/src/src/System/Language/grammar.cpp
@@ -151,7 +151,8 @@ parser_rep::parse_level(string calling_letter,
 			int level, tree parsing_tree, int pos) {
   if (pos > N(xstring)) return -1;
   if (level > N(xstring)) return -1;
-  quartet <string,int,tree,int> t(calling_letter,level,parsing_tree,pos);
+  quartet <string,int,tree,int> t=
+    quartet <string,int,tree,int> (calling_letter,level,parsing_tree,pos);
   if (evaluated_quartet->contains(t)) return evaluated_quartet(t);
   if (L(parsing_tree)==as_tree_label("DOLLAR")) {
     if (! grammar->contains(parsing_tree)) return -1;
@@ -262,7 +263,7 @@ parser_rep::parse(tree parsing_tree, int pos) {
   if (L(parsing_tree)==as_tree_label("CONCAT") && N(parsing_tree)>=1) { 
     tree parsing_tree2;
     int i=0;
-    int init_pos= pos;
+    // int init_pos= pos;
     do {
       parsing_tree2= parsing_tree[i];
       pos=parse(parsing_tree2, pos);
@@ -275,7 +276,7 @@ parser_rep::parse(tree parsing_tree, int pos) {
   if (L(parsing_tree)==as_tree_label("STAR") && N(parsing_tree)==1) {
     tree parsing_tree1;
     parsing_tree1= parsing_tree[0];
-    int init_pos= pos;
+    // int init_pos= pos;
     int opos;    
     do {
       opos= pos;
@@ -290,18 +291,18 @@ parser_rep::parse(tree parsing_tree, int pos) {
     string s1,s2;
     s1= parsing_tree[0]->label;
     s2= parsing_tree[1]->label;
-    int opos= pos;
+    // int opos= pos;
     if (pos+1 <= N(xstring) && s1 <= xstring(pos,pos+1)
 	&& xstring(pos,pos+1) <=s2) {pos++;}
     else pos=-1;
-    //cout<<parsing_tree<<" "<<opos<<" "<<pos<<"\n";
+    // cout<<parsing_tree<<" "<<opos<<" "<<pos<<"\n";
     evaluated_pair(p)= pos;
     return pos;
   }
   if (is_atomic(parsing_tree)) {
     string s;
     s= parsing_tree->label;
-    int opos= pos;
+    // int opos= pos;
     if (pos+N(s) <= N(xstring) && s == xstring(pos,pos+N(s))) {pos+=N(s);}
     else pos= -1;
     // cout<<parsing_tree<<" "<<opos<<" "<<pos<<"\n";
-- 
2.11.4.GIT