Mercurial > octave-nkf

comparison src/oct-map.cc @ 5073:e71be9c548f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2004-11-09 18:31:25 by jwe]
author jwe
date Tue, 09 Nov 2004 18:31:26 +0000
parents a0e7231a58eb
children e35b034d3523
comparison
equal deleted inserted replaced
5072:97b62f0c1bee 5073:e71be9c548f2
112 112
113 return retval; 113 return retval;
114 } 114 }
115 115
116 Octave_map 116 Octave_map
117 concat (const Octave_map& ra, const Octave_map& rb, const Array<int>& ra_idx) 117 Octave_map::concat (const Octave_map& rb, const Array<int>& ra_idx)
118 { 118 {
119 Octave_map retval; 119 Octave_map retval;
120 120
121 if (ra.length() == rb.length()) 121 if (length() == rb.length())
122 { 122 {
123 for (Octave_map::const_iterator pa = ra.begin (); pa != ra.end (); pa++) 123 for (Octave_map::const_iterator pa = begin (); pa != end (); pa++)
124 { 124 {
125 Octave_map::const_iterator pb = rb.seek (ra.key(pa)); 125 Octave_map::const_iterator pb = rb.seek (key(pa));
126 126
127 if (pb == rb.end ()) 127 if (pb == rb.end ())
128 { 128 {
129 error ("field name mismatch in structure concatenation"); 129 error ("field name mismatch in structure concatenation");
130 break; 130 break;
131 } 131 }
132 132
133 retval.assign (ra.key(pa), 133 retval.assign (key(pa),
134 ra.contents(pa).insert (rb.contents(pb), ra_idx)); 134 contents(pa).insert (rb.contents(pb), ra_idx));
135 } 135 }
136 } 136 }
137 else 137 else
138 error ("field name mismatch in structure concatenation"); 138 error ("field name mismatch in structure concatenation");
139 139