From ae4051cef80604f9ba1bb3826c4f4ac6f995d008 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 20 Jul 2005 21:54:24 +0000 Subject: [PATCH] add 3-d texture coordinates to egg syntax --- panda/src/doc/eggSyntax.txt | 119 +- panda/src/egg/Sources.pp | 6 +- panda/src/egg/eggAttributes.cxx | 8 +- panda/src/egg/eggGroup.cxx | 15 +- panda/src/egg/eggGroup.h | 7 +- panda/src/egg/eggMiscFuncs.cxx | 22 + panda/src/egg/eggMiscFuncs.h | 8 + panda/src/egg/eggMorph.I | 45 +- panda/src/egg/eggMorph.h | 15 +- panda/src/egg/eggMorphList.I | 7 +- panda/src/egg/eggMorphList.h | 3 +- panda/src/egg/eggObject.cxx | 12 + panda/src/egg/eggObject.h | 5 + panda/src/egg/eggPrimitive.cxx | 9 +- panda/src/egg/eggTexture.I | 67 +- panda/src/egg/eggTexture.cxx | 11 +- panda/src/egg/eggTexture.h | 11 +- panda/src/egg/eggTransform.I | 369 + .../{eggTransform3d.cxx => eggTransform.cxx} | 217 +- .../egg/{eggTransform3d.h => eggTransform.h} | 75 +- panda/src/egg/eggTransform3d.I | 240 - panda/src/egg/eggVertex.I | 2 +- panda/src/egg/eggVertex.cxx | 66 +- panda/src/egg/eggVertex.h | 7 +- panda/src/egg/eggVertexPool.cxx | 21 +- panda/src/egg/eggVertexPool.h | 3 +- panda/src/egg/eggVertexUV.I | 78 +- panda/src/egg/eggVertexUV.cxx | 46 +- panda/src/egg/eggVertexUV.h | 12 +- panda/src/egg/egg_composite2.cxx | 2 +- panda/src/egg/lexer.cxx.prebuilt | 5909 ++++++++--------- panda/src/egg/parser.cxx.prebuilt | 2818 ++++---- panda/src/egg/parser.h.prebuilt | 4 +- panda/src/egg/parser.yxx | 225 +- panda/src/egg2pg/eggLoader.cxx | 256 +- panda/src/egg2pg/eggLoader.h | 6 +- panda/src/egg2pg/eggRenderState.cxx | 19 +- panda/src/egg2pg/eggRenderState.h | 2 +- panda/src/linmath/aa_luse.h | 2 + pandatool/src/bam/bamToEgg.cxx | 6 +- pandatool/src/fltegg/fltToEggLevelState.cxx | 26 +- pandatool/src/fltprogs/eggToFlt.cxx | 97 +- pandatool/src/fltprogs/eggToFlt.h | 4 +- pandatool/src/palettizer/textureReference.cxx | 4 +- pandatool/src/xfileegg/xFileVertex.cxx | 4 +- 45 files changed, 5712 insertions(+), 5178 deletions(-) create mode 100644 panda/src/egg/eggTransform.I rename panda/src/egg/{eggTransform3d.cxx => eggTransform.cxx} (56%) rename panda/src/egg/{eggTransform3d.h => eggTransform.h} (54%) delete mode 100644 panda/src/egg/eggTransform3d.I diff --git a/panda/src/doc/eggSyntax.txt b/panda/src/doc/eggSyntax.txt index d8464da0fb..fb641e6d3a 100644 --- a/panda/src/doc/eggSyntax.txt +++ b/panda/src/doc/eggSyntax.txt @@ -372,36 +372,49 @@ appear before they are referenced. { transform-definition } - This specifies a 2-d transformation that is applied to the UV's of - a surface to generate the texture coordinates. + This specifies a 2-d or 3-d transformation that is applied to the + UV's of a surface to generate the texture coordinates. - The transform syntax is similar to that for groups, except it - defines a 2-d 3x3 matrix. The definition may be any sequence of - zero or more of the following. Transformations are post - multiplied in the order they are encountered to produce a net - transformation matrix. Rotations are counterclockwise about the - origin in degrees. Matrices, when specified explicitly, are - row-major. + The transform syntax is similar to that for groups, except it may + define either a 2-d 3x3 matrix or a 3-d 4x4 matrix. (You should + use the two-dimensional forms if the UV's are two-dimensional, and + the three-dimensional forms if the UV's are three-dimensional.) - { x y } - { degrees } - { x y } - { s } + A two-dimensional transform may be any sequence of zero or more of + the following. Transformations are post multiplied in the order + they are encountered to produce a net transformation matrix. + Rotations are counterclockwise about the origin in degrees. + Matrices, when specified explicitly, are row-major. - { - 00 01 02 - 10 11 12 - 20 21 22 - } + { x y } + { degrees } + { x y } + { s } - The transform definition might also include the following scalar: + { + 00 01 02 + 10 11 12 + 20 21 22 + } - animated { 1 } + A three-dimensional transform may be any sequence of zero or more + of the following. See the description under , below, for + more information. - If this is set, it indicates the matrix may be animated by a - matrix channel, like a joint. At present, this flag is not used; - eventually, it may be used to define an arbitrary texture - coordinate animation. + { x y z } + { degrees } + { degrees } + { degrees } + { degrees x y z } + { x y z } + { s } + + { + 00 01 02 03 + 10 11 12 13 + 20 21 22 23 + 30 31 32 33 + } name { [scalars] } @@ -525,11 +538,18 @@ appear before they are referenced. (1 1 1 1). The morph-list is an optional list of entries. - [name] { u v [tangent] [binormal] [morph-list] } + [name] { u v [w] [tangent] [binormal] [morph-list] } This gives the texture coordinates of the vertex. This must be - specified if a texture is to be mapped onto this geometry. As - before, morph-list is an optional list of entries. + specified if a texture is to be mapped onto this geometry. + + The texture coordinates are usually two-dimensional, with two + component values (u v), but they may also be three-dimensional, + with three component values (u v w). (Arguably, it should be + called instead of in the three-dimensional case, but + it's not.) + + As before, morph-list is an optional list of entries. Unlike the other kinds of attributes, there may be multiple sets of UV's on each vertex, each with a unique name; this provides @@ -544,7 +564,7 @@ appear before they are referenced. different UV coordinate set. If present, they have the expected syntax: - [name] { u v { x y z } { x y z } } + [name] { u v [w] { x y z } { x y z } } name { vertices } @@ -1000,12 +1020,13 @@ corresponding attribute entries: normalized to unit length. - target { u v } + target { u v [w] } A texture-coordinate delta, valid within a entry (within a - entry). The given 2-valued offset vector, scaled by the - morph target's value, is added to the vertex's texture coordinates - each frame. + entry). The offset vector should be 2-valued if the + enclosing UV is 2-valued, or 3-valued if the enclosing UV is + 3-valued. The given offset vector, scaled by the morph target's + value, is added to the vertex's texture coordinates each frame. target { r g b a } @@ -1366,25 +1387,25 @@ GROUPING ENTRIES a particular axis, either implicit (about the x, y, or z axis), or arbitrary. Matrices, when specified explicitly, are row-major. - { x y z } - { degrees } - { degrees } - { degrees } - { degrees x y z } - { x y z } - { s } + { x y z } + { degrees } + { degrees } + { degrees } + { degrees x y z } + { x y z } + { s } - { - 00 01 02 03 - 10 11 12 13 - 20 21 22 23 - 30 31 32 33 - } + { + 00 01 02 03 + 10 11 12 13 + 20 21 22 23 + 30 31 32 33 + } - Note that the block defines a 3-d transform when it - appears within the context of a node, while it defines a 2-d - transform (and has correspondingly different entries) when it - appears within the context of a texture. + Note that the block should always define a 3-d + transform when it appears within the body of a , while it + may define either a 2-d or a 3-d transform when it appears within + the body of a . See , above. { indices { pool-name } } diff --git a/panda/src/egg/Sources.pp b/panda/src/egg/Sources.pp index c7839b2334..992b45a170 100644 --- a/panda/src/egg/Sources.pp +++ b/panda/src/egg/Sources.pp @@ -41,7 +41,7 @@ eggTexture.h eggTextureCollection.I eggTextureCollection.h \ eggTriangleFan.I eggTriangleFan.h \ eggTriangleStrip.I eggTriangleStrip.h \ - eggTransform3d.I eggTransform3d.h \ + eggTransform.I eggTransform.h \ eggUserData.I eggUserData.h \ eggUtilities.I eggUtilities.h \ eggVertex.I eggVertex.h eggVertexPool.I eggVertexPool.h \ @@ -72,7 +72,7 @@ eggPoolUniquifier.cxx eggPrimitive.cxx eggRenderMode.cxx \ eggSAnimData.cxx eggSurface.cxx eggSwitchCondition.cxx \ eggTable.cxx eggTexture.cxx eggTextureCollection.cxx \ - eggTransform3d.cxx \ + eggTransform.cxx \ eggTriangleFan.cxx \ eggTriangleStrip.cxx \ eggUserData.cxx \ @@ -104,7 +104,7 @@ eggSAnimData.I eggSAnimData.h eggSurface.I eggSurface.h \ eggSwitchCondition.h eggTable.I eggTable.h eggTexture.I \ eggTexture.h eggTextureCollection.I eggTextureCollection.h \ - eggTransform3d.I eggTransform3d.h \ + eggTransform.I eggTransform.h \ eggTriangleFan.I eggTriangleFan.h \ eggTriangleStrip.I eggTriangleStrip.h \ eggUserData.I eggUserData.h \ diff --git a/panda/src/egg/eggAttributes.cxx b/panda/src/egg/eggAttributes.cxx index 5e7e005382..260d65b0c6 100644 --- a/panda/src/egg/eggAttributes.cxx +++ b/panda/src/egg/eggAttributes.cxx @@ -85,8 +85,8 @@ write(ostream &out, int indent_level) const { << " { " << get_normal() << " }\n"; } else { indent(out, indent_level) << " {\n"; - indent(out, indent_level+2) << get_normal() << "\n"; - _dnormals.write(out, indent_level+2); + indent(out, indent_level + 2) << get_normal() << "\n"; + _dnormals.write(out, indent_level + 2, "", 3); indent(out, indent_level) << "}\n"; } } @@ -96,8 +96,8 @@ write(ostream &out, int indent_level) const { << " { " << get_color() << " }\n"; } else { indent(out, indent_level) << " {\n"; - indent(out, indent_level+2) << get_color() << "\n"; - _drgbas.write(out, indent_level+2); + indent(out, indent_level + 2) << get_color() << "\n"; + _drgbas.write(out, indent_level + 2, "", 4); indent(out, indent_level) << "}\n"; } } diff --git a/panda/src/egg/eggGroup.cxx b/panda/src/egg/eggGroup.cxx index 0d07fada25..24136015be 100644 --- a/panda/src/egg/eggGroup.cxx +++ b/panda/src/egg/eggGroup.cxx @@ -63,7 +63,7 @@ EggGroup(const EggGroup ©) { //////////////////////////////////////////////////////////////////// EggGroup &EggGroup:: operator = (const EggGroup ©) { - EggTransform3d::operator = (copy); + EggTransform::operator = (copy); _flags = copy._flags; _flags2 = copy._flags2; _collide_mask = copy._collide_mask; @@ -215,7 +215,7 @@ write(ostream &out, int indent_level) const { write_switch_flags(out, indent_level + 2); if (has_transform()) { - EggTransform3d::write(out, indent_level + 2); + EggTransform::write(out, indent_level + 2); } write_object_types(out, indent_level + 2); @@ -995,6 +995,17 @@ string_blend_operand(const string &strval) { } } +//////////////////////////////////////////////////////////////////// +// Function: EggGroup::as_transform +// Access: Public, Virtual +// Description: Returns this object cross-cast to an EggTransform +// pointer, if it inherits from EggTransform, or NULL if +// it does not. +//////////////////////////////////////////////////////////////////// +EggTransform *EggGroup:: +as_transform() { + return this; +} //////////////////////////////////////////////////////////////////// diff --git a/panda/src/egg/eggGroup.h b/panda/src/egg/eggGroup.h index 381aaff902..e295894409 100644 --- a/panda/src/egg/eggGroup.h +++ b/panda/src/egg/eggGroup.h @@ -23,7 +23,7 @@ #include "eggGroupNode.h" #include "eggRenderMode.h" -#include "eggTransform3d.h" +#include "eggTransform.h" #include "eggVertex.h" #include "eggSwitchCondition.h" #include "pt_EggVertex.h" @@ -37,7 +37,7 @@ // Description : The main glue of the egg hierarchy, this corresponds // to the , , and type nodes. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDAEGG EggGroup : public EggGroupNode, public EggRenderMode, public EggTransform3d { +class EXPCL_PANDAEGG EggGroup : public EggGroupNode, public EggRenderMode, public EggTransform { PUBLISHED: typedef pmap VertexRef; typedef pmap TagData; @@ -297,6 +297,9 @@ PUBLISHED: static BlendMode string_blend_mode(const string &strval); static BlendOperand string_blend_operand(const string &strval); +public: + virtual EggTransform *as_transform(); + protected: void write_vertex_ref(ostream &out, int indent_level) const; virtual bool egg_start_parse_body(); diff --git a/panda/src/egg/eggMiscFuncs.cxx b/panda/src/egg/eggMiscFuncs.cxx index f5db2553bc..632a7a181b 100644 --- a/panda/src/egg/eggMiscFuncs.cxx +++ b/panda/src/egg/eggMiscFuncs.cxx @@ -94,3 +94,25 @@ write_transform(ostream &out, const LMatrix3d &mat, int indent_level) { indent(out, indent_level+2) << "}\n"; indent(out, indent_level) << "}\n"; } + +//////////////////////////////////////////////////////////////////// +// Function: write_transform +// Description: A helper function to write out a 4x4 transform +// matrix. +//////////////////////////////////////////////////////////////////// +void +write_transform(ostream &out, const LMatrix4d &mat, int indent_level) { + indent(out, indent_level) << " {\n"; + + indent(out, indent_level+2) << " {\n"; + + for (int r = 0; r < 4; r++) { + indent(out, indent_level+3); + for (int c = 0; c < 4; c++) { + out << " " << mat(r, c); + } + out << "\n"; + } + indent(out, indent_level+2) << "}\n"; + indent(out, indent_level) << "}\n"; +} diff --git a/panda/src/egg/eggMiscFuncs.h b/panda/src/egg/eggMiscFuncs.h index c9aa40f57f..266958a655 100644 --- a/panda/src/egg/eggMiscFuncs.h +++ b/panda/src/egg/eggMiscFuncs.h @@ -55,6 +55,14 @@ enquote_string(ostream &out, const string &str, void write_transform(ostream &out, const LMatrix3d &mat, int indent_level); +//////////////////////////////////////////////////////////////////// +// Function: write_transform +// Description: A helper function to write out a 4x4 transform +// matrix. +//////////////////////////////////////////////////////////////////// +void +write_transform(ostream &out, const LMatrix4d &mat, int indent_level); + #include "eggMiscFuncs.I" diff --git a/panda/src/egg/eggMorph.I b/panda/src/egg/eggMorph.I index 59d0d7680a..d49af74a39 100644 --- a/panda/src/egg/eggMorph.I +++ b/panda/src/egg/eggMorph.I @@ -105,40 +105,17 @@ compare_to(const EggMorph &other) const { return _offset.compare_to(other._offset); } - //////////////////////////////////////////////////////////////////// -// Function: EggMorphVertex output operator -// Description: +// Function: EggMorph::output +// Access: Public +// Description: //////////////////////////////////////////////////////////////////// -INLINE ostream &operator << (ostream &out, const EggMorphVertex &m) { - return out << " " << m.get_name() << " { " << m.get_offset() << " }"; -} - - -/* -//////////////////////////////////////////////////////////////////// -// Function: EggMorphNormal output operator -// Description: -//////////////////////////////////////////////////////////////////// -INLINE ostream &operator << (ostream &out, const EggMorphNormal &m) { - return out << " " << m.get_name() << " { " << m.get_offset() << " }"; -} -*/ - - -//////////////////////////////////////////////////////////////////// -// Function: EggMorphTexCoord output operator -// Description: -//////////////////////////////////////////////////////////////////// -INLINE ostream &operator << (ostream &out, const EggMorphTexCoord &m) { - return out << " " << m.get_name() << " { " << m.get_offset() << " }"; -} - - -//////////////////////////////////////////////////////////////////// -// Function: EggMorphColor output operator -// Description: -//////////////////////////////////////////////////////////////////// -INLINE ostream &operator << (ostream &out, const EggMorphColor &m) { - return out << " " << m.get_name() << " { " << m.get_offset() << " }"; +template +INLINE void EggMorph:: +output(ostream &out, const string &tag, int num_dimensions) const { + out << tag << " " << get_name() << " {"; + for (int i = 0; i < num_dimensions; ++i) { + out << " " << MAYBE_ZERO(_offset[i]); + } + out << " }"; } diff --git a/panda/src/egg/eggMorph.h b/panda/src/egg/eggMorph.h index 5331f5a23c..97814b4151 100644 --- a/panda/src/egg/eggMorph.h +++ b/panda/src/egg/eggMorph.h @@ -46,28 +46,21 @@ public: INLINE int compare_to(const EggMorph &other) const; + INLINE void output(ostream &out, const string &tag, + int num_dimensions) const; + private: Parameter _offset; }; EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, EggMorph); -EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, EggMorph); EXPORT_TEMPLATE_CLASS(EXPCL_PANDAEGG, EXPTP_PANDAEGG, EggMorph); typedef EggMorph EggMorphVertex; typedef EggMorph EggMorphNormal; -typedef EggMorph EggMorphTexCoord; +typedef EggMorph EggMorphTexCoord; typedef EggMorph EggMorphColor; -INLINE ostream &operator << (ostream &out, const EggMorphVertex &m); -INLINE ostream &operator << (ostream &out, const EggMorphTexCoord &m); -INLINE ostream &operator << (ostream &out, const EggMorphColor &m); - -// EggMorphNormal is, by virtue of equivalent typedefs, another name -// for EggMorphVertex. Therefore we shouldn't define its output -// operator again. -//INLINE ostream &operator << (ostream &out, const EggMorphNormal &m); - #include "eggMorph.I" #endif diff --git a/panda/src/egg/eggMorphList.I b/panda/src/egg/eggMorphList.I index be6ac48a6c..9bbbc02d29 100644 --- a/panda/src/egg/eggMorphList.I +++ b/panda/src/egg/eggMorphList.I @@ -231,11 +231,14 @@ clear() { //////////////////////////////////////////////////////////////////// template void EggMorphList:: -write(ostream &out, int indent_level) const { +write(ostream &out, int indent_level, const string &tag, + int num_dimensions) const { const_iterator i; for (i = begin(); i != end(); ++i) { - indent(out, indent_level) << *i << "\n"; + indent(out, indent_level); + i->output(out, tag, num_dimensions); + out << "\n"; } } diff --git a/panda/src/egg/eggMorphList.h b/panda/src/egg/eggMorphList.h index ce27a40906..741c217dae 100644 --- a/panda/src/egg/eggMorphList.h +++ b/panda/src/egg/eggMorphList.h @@ -62,7 +62,8 @@ public: pair insert(const MorphType &value); INLINE void clear(); - void write(ostream &out, int indent_level) const; + void write(ostream &out, int indent_level, + const string &tag, int num_dimensions) const; private: Morphs _morphs; diff --git a/panda/src/egg/eggObject.cxx b/panda/src/egg/eggObject.cxx index 6e5e507a3a..538e9ad2ff 100644 --- a/panda/src/egg/eggObject.cxx +++ b/panda/src/egg/eggObject.cxx @@ -175,3 +175,15 @@ clear_user_data(TypeHandle type) { _user_data.erase(ui); } } + +//////////////////////////////////////////////////////////////////// +// Function: EggObject::as_transform +// Access: Public, Virtual +// Description: Returns this object cross-cast to an EggTransform +// pointer, if it inherits from EggTransform, or NULL if +// it does not. +//////////////////////////////////////////////////////////////////// +EggTransform *EggObject:: +as_transform() { + return NULL; +} diff --git a/panda/src/egg/eggObject.h b/panda/src/egg/eggObject.h index 6e31c78e15..4bf4400b27 100644 --- a/panda/src/egg/eggObject.h +++ b/panda/src/egg/eggObject.h @@ -25,6 +25,8 @@ #include "pointerTo.h" #include "pmap.h" +class EggTransform; + //////////////////////////////////////////////////////////////////// // Class : EggObject // Description : The highest-level base class in the egg directory. @@ -46,6 +48,9 @@ PUBLISHED: void clear_user_data(); void clear_user_data(TypeHandle type); +public: + virtual EggTransform *as_transform(); + private: typedef pmap UserData; UserData _user_data; diff --git a/panda/src/egg/eggPrimitive.cxx b/panda/src/egg/eggPrimitive.cxx index b822f59b8b..a0785ccf4a 100644 --- a/panda/src/egg/eggPrimitive.cxx +++ b/panda/src/egg/eggPrimitive.cxx @@ -1037,7 +1037,7 @@ r_apply_texmats(EggTextureCollection &textures) { // We've got a texture with a matrix applied. Save the matrix, // and get a new texture without the matrix. - LMatrix3d mat = texture->get_transform(); + LMatrix4d mat = texture->get_transform(); EggTexture new_texture(*texture); new_texture.clear_transform(); EggTexture *unique = textures.create_unique_texture(new_texture, ~0); @@ -1055,7 +1055,12 @@ r_apply_texmats(EggTextureCollection &textures) { if (uv_obj != (EggVertexUV *)NULL) { EggVertex new_vertex(*vertex); PT(EggVertexUV) new_uv_obj = new EggVertexUV(*uv_obj); - new_uv_obj->set_uv(uv_obj->get_uv() * mat); + TexCoord3d uvw = uv_obj->get_uvw() * mat; + if (uv_obj->has_w() || !texture->is_transform_2d()) { + new_uv_obj->set_uvw(uvw); + } else { + new_uv_obj->set_uv(TexCoordd(uvw[0], uvw[1])); + } new_vertex.set_uv_obj(new_uv_obj); EggVertexPool *pool = vertex->get_pool(); diff --git a/panda/src/egg/eggTexture.I b/panda/src/egg/eggTexture.I index 61b8a6daa4..e60dffb051 100644 --- a/panda/src/egg/eggTexture.I +++ b/panda/src/egg/eggTexture.I @@ -522,8 +522,12 @@ get_color() const { //////////////////////////////////////////////////////////////////// INLINE void EggTexture:: set_uv_name(const string &uv_name) { - _uv_name = uv_name; - _flags |= F_has_uv_name; + if (uv_name == "default" || uv_name.empty()) { + clear_uv_name(); + } else { + _uv_name = uv_name; + _flags |= F_has_uv_name; + } } //////////////////////////////////////////////////////////////////// @@ -663,65 +667,6 @@ get_alpha_scale() const { return _alpha_scale; } -//////////////////////////////////////////////////////////////////// -// Function: EggTexture::set_transform -// Access: Published -// Description: -//////////////////////////////////////////////////////////////////// -INLINE void EggTexture:: -set_transform(const LMatrix3d &transform) { - _transform = transform; - _flags |= F_has_transform; -} - -//////////////////////////////////////////////////////////////////// -// Function: EggTexture::clear_transform -// Access: Published -// Description: -//////////////////////////////////////////////////////////////////// -INLINE void EggTexture:: -clear_transform() { - _transform = LMatrix3d::ident_mat(); - _flags &= ~F_has_transform; -} - -//////////////////////////////////////////////////////////////////// -// Function: EggTexture::has_transform -// Access: Published -// Description: Returns true if a texture matrix transform has been -// specified for the texture (even if the transform is -// identity). -//////////////////////////////////////////////////////////////////// -INLINE bool EggTexture:: -has_transform() const { - return (_flags & F_has_transform) != 0; -} - -//////////////////////////////////////////////////////////////////// -// Function: EggTexture::get_transform -// Access: Published -// Description: Returns the texture matrix transform if one has been -// specified, or identity matrix otherwise. -//////////////////////////////////////////////////////////////////// -INLINE const LMatrix3d &EggTexture:: -get_transform() const { - return _transform; -} - -//////////////////////////////////////////////////////////////////// -// Function: EggTexture::transform_is_identity() -// Access: Published -// Description: Returns true if no texture matrix transform has been -// specified, or if the one specified is the identity -// transform. Returns false only if a nonidentity -// transform has been applied. -//////////////////////////////////////////////////////////////////// -INLINE bool EggTexture:: -transform_is_identity() const { - return (!has_transform() || - _transform.almost_equal(LMatrix3d::ident_mat(), 0.0001)); -} - //////////////////////////////////////////////////////////////////// // Function: EggTexture::set_alpha_filename // Access: Published diff --git a/panda/src/egg/eggTexture.cxx b/panda/src/egg/eggTexture.cxx index 926e13a93e..24a953f0ec 100644 --- a/panda/src/egg/eggTexture.cxx +++ b/panda/src/egg/eggTexture.cxx @@ -48,7 +48,6 @@ EggTexture(const string &tref_name, const string &filename) _priority = 0; _color.set(0.0f, 0.0f, 0.0f, 1.0f); _flags = 0; - _transform = LMatrix3d::ident_mat(); _alpha_file_channel = 0; _multitexture_sort = 0; } @@ -74,6 +73,7 @@ operator = (const EggTexture ©) { EggFilenameNode::operator = (copy); EggRenderMode::operator = (copy); + EggTransform::operator = (copy); _format = copy._format; _wrap_mode = copy._wrap_mode; @@ -92,7 +92,6 @@ operator = (const EggTexture ©) { _rgb_scale = 1; _alpha_scale = 1; _flags = copy._flags; - _transform = copy._transform; _alpha_filename = copy._alpha_filename; _alpha_fullpath = copy._alpha_fullpath; _alpha_file_channel = copy._alpha_file_channel; @@ -247,7 +246,7 @@ write(ostream &out, int indent_level) const { EggRenderMode::write(out, indent_level + 2); if (has_transform()) { - write_transform(out, _transform, indent_level + 2); + EggTransform::write(out, indent_level + 2); } indent(out, indent_level) << "}\n"; @@ -324,7 +323,7 @@ is_equivalent_to(const EggTexture &other, int eq) const { } if (has_transform() && other.has_transform()) { - if (!_transform.almost_equal(other._transform, 0.0001)) { + if (!get_transform().almost_equal(other.get_transform(), 0.0001)) { return false; } } @@ -400,9 +399,9 @@ sorts_less_than(const EggTexture &other, int eq) const { } if (has_transform() && other.has_transform()) { - int compare = _transform.compare_to(other._transform); + int compare = get_transform().compare_to(other.get_transform()); if (compare != 0) { - return compare < 0; + return compare < 0; } } } diff --git a/panda/src/egg/eggTexture.h b/panda/src/egg/eggTexture.h index ff56489140..60e14da5e8 100644 --- a/panda/src/egg/eggTexture.h +++ b/panda/src/egg/eggTexture.h @@ -23,6 +23,7 @@ #include "eggRenderMode.h" #include "eggFilenameNode.h" +#include "eggTransform.h" #include "pset.h" #include "luse.h" @@ -33,7 +34,7 @@ // Description : Defines a texture map that may be applied to // geometry. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDAEGG EggTexture : public EggFilenameNode, public EggRenderMode { +class EXPCL_PANDAEGG EggTexture : public EggFilenameNode, public EggRenderMode, public EggTransform { PUBLISHED: EggTexture(const string &tref_name, const string &filename); EggTexture(const EggTexture ©); @@ -216,12 +217,6 @@ PUBLISHED: INLINE bool has_alpha_scale() const; INLINE int get_alpha_scale() const; - INLINE void set_transform(const LMatrix3d &transform); - INLINE void clear_transform(); - INLINE bool has_transform() const; - INLINE const LMatrix3d &get_transform() const; - INLINE bool transform_is_identity() const; - INLINE void set_alpha_filename(const Filename &filename); INLINE void clear_alpha_filename(); INLINE bool has_alpha_filename() const; @@ -256,7 +251,6 @@ private: bool r_min_multitexture_sort(int sort, MultiTextures &cycle_detector); enum Flags { - F_has_transform = 0x0001, F_has_alpha_filename = 0x0002, F_has_anisotropic_degree = 0x0004, F_has_alpha_file_channel = 0x0008, @@ -282,7 +276,6 @@ private: int _rgb_scale; int _alpha_scale; int _flags; - LMatrix3d _transform; Filename _alpha_filename; Filename _alpha_fullpath; int _alpha_file_channel; diff --git a/panda/src/egg/eggTransform.I b/panda/src/egg/eggTransform.I new file mode 100644 index 0000000000..6684a39417 --- /dev/null +++ b/panda/src/egg/eggTransform.I @@ -0,0 +1,369 @@ +// Filename: eggTransform.I +// Created by: drose (21Jun02) +// +//////////////////////////////////////////////////////////////////// +// +// PANDA 3D SOFTWARE +// Copyright (c) 2001 - 2004, Disney Enterprises, Inc. All rights reserved +// +// All use of this software is subject to the terms of the Panda 3d +// Software license. You should have received a copy of this license +// along with this source code; you will also find a current copy of +// the license at http://etc.cmu.edu/panda3d/docs/license/ . +// +// To contact the maintainers of this program write to +// panda3d-general@lists.sourceforge.net . +// +//////////////////////////////////////////////////////////////////// + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::Component::Constructor +// Access: Public +// Description: +//////////////////////////////////////////////////////////////////// +INLINE EggTransform::Component:: +Component(EggTransform::ComponentType type, double number) : + _type(type), + _number(number) +{ + _vec2 = (LVecBase2d *)NULL; + _vec3 = (LVecBase3d *)NULL; + _mat3 = (LMatrix3d *)NULL; + _mat4 = (LMatrix4d *)NULL; +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::Component::Copy Constructor +// Access: Public +// Description: +//////////////////////////////////////////////////////////////////// +INLINE EggTransform::Component:: +Component(const EggTransform::Component ©) : + _type(copy._type), + _number(copy._number) +{ + _vec2 = (LVecBase2d *)NULL; + _vec3 = (LVecBase3d *)NULL; + _mat3 = (LMatrix3d *)NULL; + _mat4 = (LMatrix4d *)NULL; + if (copy._vec2 != (LVecBase2d *)NULL) { + _vec2 = new LVector2d(*copy._vec2); + } + if (copy._vec3 != (LVecBase3d *)NULL) { + _vec3 = new LVector3d(*copy._vec3); + } + if (copy._mat3 != (LMatrix3d *)NULL) { + _mat3 = new LMatrix3d(*copy._mat3); + } + if (copy._mat4 != (LMatrix4d *)NULL) { + _mat4 = new LMatrix4d(*copy._mat4); + } +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::Component::Copy Assignment Operator +// Access: Public +// Description: +//////////////////////////////////////////////////////////////////// +INLINE void EggTransform::Component:: +operator = (const EggTransform::Component ©) { + _type = copy._type; + _number = copy._number; + if (_vec2 != (LVecBase2d *)NULL) { + delete _vec2; + _vec2 = (LVecBase2d *)NULL; + } + if (_vec3 != (LVecBase3d *)NULL) { + delete _vec3; + _vec3 = (LVecBase3d *)NULL; + } + if (_mat3 != (LMatrix3d *)NULL) { + delete _mat3; + _mat3 = (LMatrix3d *)NULL; + } + if (_mat4 != (LMatrix4d *)NULL) { + delete _mat4; + _mat4 = (LMatrix4d *)NULL; + } + if (copy._vec2 != (LVecBase2d *)NULL) { + _vec2 = new LVecBase2d(*copy._vec2); + } + if (copy._vec3 != (LVecBase3d *)NULL) { + _vec3 = new LVecBase3d(*copy._vec3); + } + if (copy._mat3 != (LMatrix3d *)NULL) { + _mat3 = new LMatrix3d(*copy._mat3); + } + if (copy._mat4 != (LMatrix4d *)NULL) { + _mat4 = new LMatrix4d(*copy._mat4); + } +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::Component::Destructor +// Access: Public +// Description: +//////////////////////////////////////////////////////////////////// +INLINE EggTransform::Component:: +~Component() { + if (_vec2 != (LVecBase2d *)NULL) { + delete _vec2; + } + if (_vec3 != (LVecBase3d *)NULL) { + delete _vec3; + } + if (_mat3 != (LMatrix3d *)NULL) { + delete _mat3; + } + if (_mat4 != (LMatrix4d *)NULL) { + delete _mat4; + } +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::clear_transform +// Access: Public +// Description: Resets the transform to empty, identity. +//////////////////////////////////////////////////////////////////// +INLINE void EggTransform:: +clear_transform() { + internal_clear_transform(); + transform_changed(); +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::add_matrix3 +// Access: Public +// Description: Appends an arbitrary 3x3 matrix to the current +// transform. +//////////////////////////////////////////////////////////////////// +INLINE void EggTransform:: +add_matrix3(const LMatrix3d &mat) { + internal_add_matrix(mat); + transform_changed(); +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::add_matrix4 +// Access: Public +// Description: Appends an arbitrary 4x4 matrix to the current +// transform. +//////////////////////////////////////////////////////////////////// +INLINE void EggTransform:: +add_matrix4(const LMatrix4d &mat) { + internal_add_matrix(mat); + transform_changed(); +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::has_transform +// Access: Public +// Description: Returns true if the transform is nonempty, false if +// it is empty (no transform components have been +// added). +//////////////////////////////////////////////////////////////////// +INLINE bool EggTransform:: +has_transform() const { + return !_components.empty(); +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::is_transform_2d +// Access: Public +// Description: Returns true if the transform is specified as a 2-d +// transform, e.g. with a 3x3 matrix, or false if it is +// specified as a 3-d transform, with a 4x4 matrix. +// +// Normally, EggTextures have a 2-d matrix (but +// occasionally they use a 3-d matrix), and EggGroups +// always have a 3-d matrix. +//////////////////////////////////////////////////////////////////// +INLINE bool EggTransform:: +is_transform_2d() const { + return _is_transform_2d; +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::set_transform_2d +// Access: Public +// Description: Sets the overall transform as a 3x3 matrix. This +// completely replaces whatever componentwise transform +// may have been defined. +//////////////////////////////////////////////////////////////////// +INLINE void EggTransform:: +set_transform_2d(const LMatrix3d &mat) { + internal_set_transform(mat); + transform_changed(); +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::set_transform +// Access: Public +// Description: Sets the overall transform as a 4x4 matrix. This +// completely replaces whatever componentwise transform +// may have been defined. +//////////////////////////////////////////////////////////////////// +INLINE void EggTransform:: +set_transform(const LMatrix4d &mat) { + internal_set_transform(mat); + transform_changed(); +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::get_transform_2d +// Access: Public +// Description: Returns the overall transform as a 3x3 matrix. It is +// only valid to call this if is_transform_2d() has +// returned true. +//////////////////////////////////////////////////////////////////// +INLINE LMatrix3d EggTransform:: +get_transform_2d() const { + nassertr(is_transform_2d(), LMatrix3d::ident_mat()); + const LMatrix4d &t = _transform; + return LMatrix3d(t(0, 0), t(0, 1), t(0, 3), + t(1, 0), t(1, 1), t(1, 3), + t(3, 0), t(3, 1), t(3, 3)); +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::get_transform +// Access: Public +// Description: Returns the overall transform as a 4x4 matrix. +//////////////////////////////////////////////////////////////////// +INLINE const LMatrix4d &EggTransform:: +get_transform() const { + return _transform; +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::transform_is_identity +// Access: Public +// Description: Returns true if the described transform is identity, +// false otherwise. +//////////////////////////////////////////////////////////////////// +INLINE bool EggTransform:: +transform_is_identity() const { + return _components.empty() || + _transform.almost_equal(LMatrix4d::ident_mat(), 0.0001); +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::get_num_components +// Access: Public +// Description: Returns the number of components that make up the +// transform. +//////////////////////////////////////////////////////////////////// +INLINE int EggTransform:: +get_num_components() const { + return _components.size(); +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::get_component_type +// Access: Public +// Description: Returns the type of the nth component. +//////////////////////////////////////////////////////////////////// +INLINE EggTransform::ComponentType EggTransform:: +get_component_type(int n) const { + nassertr(n >= 0 && n < (int)_components.size(), CT_invalid); + return _components[n]._type; +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::get_component_number +// Access: Public +// Description: Returns the solitary number associated with the nth +// component. In the case of a rotation, this is the +// angle in degrees to rotate; in the case of uniform +// scale, this is the amount of the scale. Other types +// do not use this property. +//////////////////////////////////////////////////////////////////// +INLINE double EggTransform:: +get_component_number(int n) const { + nassertr(n >= 0 && n < (int)_components.size(), 0.0); + return _components[n]._number; +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::get_component_vec2 +// Access: Public +// Description: Returns the 2-component vector associated with the +// nth component. This may be the translate vector, +// rotate axis, or non-uniform scale. It is an error to +// call this if the component type does not use a 2-d +// vector property. +//////////////////////////////////////////////////////////////////// +INLINE const LVecBase2d &EggTransform:: +get_component_vec2(int n) const { + nassertr(n >= 0 && n < (int)_components.size(), LVector2d::zero()); + nassertr(_components[n]._vec2 != (LVecBase2d *)NULL, LVector2d::zero()); + return *_components[n]._vec2; +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::get_component_vec3 +// Access: Public +// Description: Returns the 3-component vector associated with the +// nth component. This may be the translate vector, +// rotate axis, or non-uniform scale. It is an error to +// call this if the component type does not use a 3-d +// vector property. +//////////////////////////////////////////////////////////////////// +INLINE const LVecBase3d &EggTransform:: +get_component_vec3(int n) const { + nassertr(n >= 0 && n < (int)_components.size(), LVector3d::zero()); + nassertr(_components[n]._vec3 != (LVecBase3d *)NULL, LVector3d::zero()); + return *_components[n]._vec3; +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::get_component_mat3 +// Access: Public +// Description: Returns the 3x3 matrix associated with the nth +// component. It is an error to call this if the +// component type is not CT_matrix3. +//////////////////////////////////////////////////////////////////// +INLINE const LMatrix3d &EggTransform:: +get_component_mat3(int n) const { + nassertr(n >= 0 && n < (int)_components.size(), LMatrix3d::ident_mat()); + nassertr(_components[n]._mat3 != (LMatrix3d *)NULL, LMatrix3d::ident_mat()); + return *_components[n]._mat3; +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::get_component_mat4 +// Access: Public +// Description: Returns the 4x4 matrix associated with the nth +// component. It is an error to call this if the +// component type is not CT_matrix4. +//////////////////////////////////////////////////////////////////// +INLINE const LMatrix4d &EggTransform:: +get_component_mat4(int n) const { + nassertr(n >= 0 && n < (int)_components.size(), LMatrix4d::ident_mat()); + nassertr(_components[n]._mat4 != (LMatrix4d *)NULL, LMatrix4d::ident_mat()); + return *_components[n]._mat4; +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::internal_set_transform +// Access: Protected +// Description: Sets the overall transform without calling +// transform_changed(). +//////////////////////////////////////////////////////////////////// +INLINE void EggTransform:: +internal_set_transform(const LMatrix3d &mat) { + internal_clear_transform(); + internal_add_matrix(mat); +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::internal_set_transform +// Access: Protected +// Description: Sets the overall transform without calling +// transform_changed(). +//////////////////////////////////////////////////////////////////// +INLINE void EggTransform:: +internal_set_transform(const LMatrix4d &mat) { + internal_clear_transform(); + internal_add_matrix(mat); +} diff --git a/panda/src/egg/eggTransform3d.cxx b/panda/src/egg/eggTransform.cxx similarity index 56% rename from panda/src/egg/eggTransform3d.cxx rename to panda/src/egg/eggTransform.cxx index 9ce41217da..b404cbb065 100644 --- a/panda/src/egg/eggTransform3d.cxx +++ b/panda/src/egg/eggTransform.cxx @@ -1,4 +1,4 @@ -// Filename: eggTransform3d.cxx +// Filename: eggTransform.cxx // Created by: drose (21Jun02) // //////////////////////////////////////////////////////////////////// @@ -16,158 +16,211 @@ // //////////////////////////////////////////////////////////////////// -#include "eggTransform3d.h" +#include "eggTransform.h" //////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::Constructor +// Function: EggTransform::Constructor // Access: Public // Description: //////////////////////////////////////////////////////////////////// -EggTransform3d:: -EggTransform3d() : +EggTransform:: +EggTransform() : + _is_transform_2d(true), _transform(LMatrix4d::ident_mat()) { } //////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::Copy Constructor +// Function: EggTransform::Copy Constructor // Access: Public // Description: //////////////////////////////////////////////////////////////////// -EggTransform3d:: -EggTransform3d(const EggTransform3d ©) : +EggTransform:: +EggTransform(const EggTransform ©) : + _is_transform_2d(copy._is_transform_2d), _components(copy._components), _transform(copy._transform) { } //////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::Copy assignment operator +// Function: EggTransform::Copy assignment operator // Access: Public // Description: //////////////////////////////////////////////////////////////////// -EggTransform3d &EggTransform3d:: -operator = (const EggTransform3d ©) { +EggTransform &EggTransform:: +operator = (const EggTransform ©) { + _is_transform_2d = copy._is_transform_2d; _components = copy._components; _transform = copy._transform; return *this; } //////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::Destructor +// Function: EggTransform::Destructor // Access: Public, Virtual // Description: //////////////////////////////////////////////////////////////////// -EggTransform3d:: -~EggTransform3d() { +EggTransform:: +~EggTransform() { } //////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::add_translate +// Function: EggTransform::add_translate2d // Access: Public -// Description: Appends a translation operation to the current +// Description: Appends a 2-d translation operation to the current // transform. //////////////////////////////////////////////////////////////////// -void EggTransform3d:: -add_translate(const LVector3d &translate) { - _components.push_back(Component(CT_translate)); - _components.back()._vector = new LVector3d(translate); +void EggTransform:: +add_translate2d(const LVector2d &translate) { + _components.push_back(Component(CT_translate2d)); + _components.back()._vec2 = new LVecBase2d(translate); + _transform *= LMatrix4d::translate_mat(LVector3d(translate[0], translate[1], 0.0)); + transform_changed(); +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::add_translate3d +// Access: Public +// Description: Appends a 3-d translation operation to the current +// transform. +//////////////////////////////////////////////////////////////////// +void EggTransform:: +add_translate3d(const LVector3d &translate) { + _is_transform_2d = false; + _components.push_back(Component(CT_translate3d)); + _components.back()._vec3 = new LVecBase3d(translate); _transform *= LMatrix4d::translate_mat(translate); transform_changed(); } //////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::add_rotx +// Function: EggTransform::add_rotate2d +// Access: Public +// Description: Appends a 2-d rotation to the current transform. The +// rotation angle is specified in degrees +// counterclockwise about the origin. +//////////////////////////////////////////////////////////////////// +void EggTransform:: +add_rotate2d(double angle) { + _components.push_back(Component(CT_rotate2d, angle)); + _transform *= LMatrix4d::rotate_mat_normaxis(angle, LVector3d(0.0, 0.0, 1.0)); + transform_changed(); +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::add_rotx // Access: Public // Description: Appends a rotation about the X axis to the current // transform. The rotation angle is specified in // degrees counterclockwise about the axis. //////////////////////////////////////////////////////////////////// -void EggTransform3d:: +void EggTransform:: add_rotx(double angle) { + _is_transform_2d = false; _components.push_back(Component(CT_rotx, angle)); _transform *= LMatrix4d::rotate_mat_normaxis(angle, LVector3d(1.0, 0.0, 0.0)); transform_changed(); } //////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::add_roty +// Function: EggTransform::add_roty // Access: Public // Description: Appends a rotation about the Y axis to the current // transform. The rotation angle is specified in // degrees counterclockwise about the axis. //////////////////////////////////////////////////////////////////// -void EggTransform3d:: +void EggTransform:: add_roty(double angle) { + _is_transform_2d = false; _components.push_back(Component(CT_roty, angle)); _transform *= LMatrix4d::rotate_mat_normaxis(angle, LVector3d(0.0, 1.0, 0.0)); transform_changed(); } //////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::add_rotz +// Function: EggTransform::add_rotz // Access: Public // Description: Appends a rotation about the Z axis to the current // transform. The rotation angle is specified in // degrees counterclockwise about the axis. //////////////////////////////////////////////////////////////////// -void EggTransform3d:: +void EggTransform:: add_rotz(double angle) { + _is_transform_2d = false; _components.push_back(Component(CT_rotz, angle)); _transform *= LMatrix4d::rotate_mat_normaxis(angle, LVector3d(0.0, 0.0, 1.0)); transform_changed(); } //////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::add_rotate +// Function: EggTransform::add_rotate3d // Access: Public -// Description: Appends a rotation about an arbitrary axis to the +// Description: Appends a 3-d rotation about an arbitrary axis to the // current transform. The rotation angle is specified // in degrees counterclockwise about the axis. //////////////////////////////////////////////////////////////////// -void EggTransform3d:: -add_rotate(double angle, const LVector3d &axis) { +void EggTransform:: +add_rotate3d(double angle, const LVector3d &axis) { + _is_transform_2d = false; LVector3d normaxis = normalize(axis); - _components.push_back(Component(CT_rotate, angle)); - _components.back()._vector = new LVector3d(normaxis); + _components.push_back(Component(CT_rotate3d, angle)); + _components.back()._vec3 = new LVecBase3d(normaxis); _transform *= LMatrix4d::rotate_mat(angle, normaxis); transform_changed(); } //////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::add_rotate +// Function: EggTransform::add_rotate3d // Access: Public -// Description: Appends an arbitrary rotation to the current +// Description: Appends an arbitrary 3-d rotation to the current // transform, expressed as a quaternion. This is // converted to axis-angle notation for the egg file. //////////////////////////////////////////////////////////////////// -void EggTransform3d:: -add_rotate(const LQuaterniond &quat) { - add_rotate(quat.get_angle(), quat.get_axis()); +void EggTransform:: +add_rotate3d(const LQuaterniond &quat) { + _is_transform_2d = false; + add_rotate3d(quat.get_angle(), quat.get_axis()); transform_changed(); } //////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::add_scale +// Function: EggTransform::add_scale2d // Access: Public // Description: Appends a possibly non-uniform scale to the current // transform. //////////////////////////////////////////////////////////////////// -void EggTransform3d:: -add_scale(const LVecBase3d &scale) { - _components.push_back(Component(CT_scale)); - _components.back()._vector = new LVector3d(scale); +void EggTransform:: +add_scale2d(const LVecBase2d &scale) { + _is_transform_2d = false; + _components.push_back(Component(CT_scale2d)); + _components.back()._vec2 = new LVecBase2d(scale); + _transform *= LMatrix4d::scale_mat(LVecBase3d(scale[0], scale[1], 1.0)); + transform_changed(); +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::add_scale3d +// Access: Public +// Description: Appends a possibly non-uniform scale to the current +// transform. +//////////////////////////////////////////////////////////////////// +void EggTransform:: +add_scale3d(const LVecBase3d &scale) { + _is_transform_2d = false; + _components.push_back(Component(CT_scale3d)); + _components.back()._vec3 = new LVecBase3d(scale); _transform *= LMatrix4d::scale_mat(scale); transform_changed(); } //////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::add_uniform_scale +// Function: EggTransform::add_uniform_scale // Access: Public // Description: Appends a uniform scale to the current transform. //////////////////////////////////////////////////////////////////// -void EggTransform3d:: +void EggTransform:: add_uniform_scale(double scale) { _components.push_back(Component(CT_uniform_scale, scale)); _transform *= LMatrix4d::scale_mat(scale); @@ -175,21 +228,31 @@ add_uniform_scale(double scale) { } //////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::write +// Function: EggTransform::write // Access: Public // Description: Writes the transform to the indicated stream in Egg // format. //////////////////////////////////////////////////////////////////// -void EggTransform3d:: +void EggTransform:: write(ostream &out, int indent_level) const { indent(out, indent_level) << " {\n"; int num_components = get_num_components(); for (int i = 0; i < num_components; i++) { switch (get_component_type(i)) { - case CT_translate: + case CT_translate2d: indent(out, indent_level + 2) - << " { " << get_component_vector(i) << " }\n"; + << " { " << get_component_vec2(i) << " }\n"; + break; + + case CT_translate3d: + indent(out, indent_level + 2) + << " { " << get_component_vec3(i) << " }\n"; + break; + + case CT_rotate2d: + indent(out, indent_level + 2) + << " { " << get_component_number(i) << " }\n"; break; case CT_rotx: @@ -207,15 +270,20 @@ write(ostream &out, int indent_level) const { << " { " << get_component_number(i) << " }\n"; break; - case CT_rotate: + case CT_rotate3d: indent(out, indent_level + 2) << " { " << get_component_number(i) << " " - << get_component_vector(i) << " }\n"; + << get_component_vec3(i) << " }\n"; break; - case CT_scale: + case CT_scale2d: indent(out, indent_level + 2) - << " { " << get_component_vector(i) << " }\n"; + << " { " << get_component_vec2(i) << " }\n"; + break; + + case CT_scale3d: + indent(out, indent_level + 2) + << " { " << get_component_vec3(i) << " }\n"; break; case CT_uniform_scale: @@ -223,9 +291,15 @@ write(ostream &out, int indent_level) const { << " { " << get_component_number(i) << " }\n"; break; - case CT_matrix: + case CT_matrix3: + indent(out, indent_level + 2) << " {\n"; + get_component_mat3(i).write(out, indent_level + 4); + indent(out, indent_level + 2) << "}\n"; + break; + + case CT_matrix4: indent(out, indent_level + 2) << " {\n"; - get_component_matrix(i).write(out, indent_level + 4); + get_component_mat4(i).write(out, indent_level + 4); indent(out, indent_level + 2) << "}\n"; break; @@ -239,39 +313,58 @@ write(ostream &out, int indent_level) const { } //////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::internal_clear_transform +// Function: EggTransform::internal_clear_transform // Access: Public // Description: Resets the transform to empty without calling // transform_changed(). //////////////////////////////////////////////////////////////////// -void EggTransform3d:: +void EggTransform:: internal_clear_transform() { + _is_transform_2d = true; _components.clear(); _transform = LMatrix4d::ident_mat(); } //////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::internal_add_matrix +// Function: EggTransform::internal_add_matrix // Access: Public // Description: Appends an arbitrary 4x4 matrix to the current // transform, without calling transform_changed(). //////////////////////////////////////////////////////////////////// -void EggTransform3d:: +void EggTransform:: +internal_add_matrix(const LMatrix3d &mat) { + _components.push_back(Component(CT_matrix3)); + _components.back()._mat3 = new LMatrix3d(mat); + LMatrix4d mat4(mat(0, 0), mat(0, 1), 0.0, mat(0, 2), + mat(1, 0), mat(1, 1), 0.0, mat(1, 2), + 0.0, 0.0, 1.0, 0.0, + mat(2, 0), mat(2, 1), 0.0, mat(2, 2)); + _transform *= mat4; +} + +//////////////////////////////////////////////////////////////////// +// Function: EggTransform::internal_add_matrix +// Access: Public +// Description: Appends an arbitrary 4x4 matrix to the current +// transform, without calling transform_changed(). +//////////////////////////////////////////////////////////////////// +void EggTransform:: internal_add_matrix(const LMatrix4d &mat) { - _components.push_back(Component(CT_matrix)); - _components.back()._matrix = new LMatrix4d(mat); + _is_transform_2d = false; + _components.push_back(Component(CT_matrix4)); + _components.back()._mat4 = new LMatrix4d(mat); _transform *= mat; } //////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::transform_changed +// Function: EggTransform::transform_changed // Access: Protected, Virtual // Description: This virtual method is called whenever the transform // is changed; it is intended to provide a hook for // derived classes (e.g. EggGroup) to update their // internal cache appropriately. //////////////////////////////////////////////////////////////////// -void EggTransform3d:: +void EggTransform:: transform_changed() { } diff --git a/panda/src/egg/eggTransform3d.h b/panda/src/egg/eggTransform.h similarity index 54% rename from panda/src/egg/eggTransform3d.h rename to panda/src/egg/eggTransform.h index e9503f913f..90e8c4312c 100644 --- a/panda/src/egg/eggTransform3d.h +++ b/panda/src/egg/eggTransform.h @@ -1,4 +1,4 @@ -// Filename: eggTransform3d.h +// Filename: eggTransform.h // Created by: drose (21Jun02) // //////////////////////////////////////////////////////////////////// @@ -16,67 +16,85 @@ // //////////////////////////////////////////////////////////////////// -#ifndef EGGTRANSFORM3D_H -#define EGGTRANSFORM3D_H +#ifndef EGGTRANSFORM_H +#define EGGTRANSFORM_H #include "pandabase.h" #include "luse.h" //////////////////////////////////////////////////////////////////// -// Class : EggTransform3d +// Class : EggTransform // Description : This represents the entry of a group -// node: a list of component transform operations, -// applied in order, that describe a net transform -// matrix. This is a 3-d transform, and therefore -// computes a 4x4 matrix. +// or texture node: a list of component transform +// operations, applied in order, that describe a net +// transform matrix. +// +// This may be either a 3-d transform, and therefore +// described by a 4x4 matrix, or a 2-d transform, +// described by a 3x3 matrix. //////////////////////////////////////////////////////////////////// -class EXPCL_PANDAEGG EggTransform3d { +class EXPCL_PANDAEGG EggTransform { PUBLISHED: - EggTransform3d(); - EggTransform3d(const EggTransform3d ©); - EggTransform3d &operator = (const EggTransform3d ©); - virtual ~EggTransform3d(); + EggTransform(); + EggTransform(const EggTransform ©); + EggTransform &operator = (const EggTransform ©); + virtual ~EggTransform(); INLINE void clear_transform(); - void add_translate(const LVector3d &translate); + void add_translate2d(const LVector2d &translate); + void add_translate3d(const LVector3d &translate); + void add_rotate2d(double angle); void add_rotx(double angle); void add_roty(double angle); void add_rotz(double angle); - void add_rotate(double angle, const LVector3d &axis); - void add_rotate(const LQuaterniond &quat); - void add_scale(const LVecBase3d &scale); + void add_rotate3d(double angle, const LVector3d &axis); + void add_rotate3d(const LQuaterniond &quat); + void add_scale2d(const LVecBase2d &scale); + void add_scale3d(const LVecBase3d &scale); void add_uniform_scale(double scale); - INLINE void add_matrix(const LMatrix4d &mat); + INLINE void add_matrix3(const LMatrix3d &mat); + INLINE void add_matrix4(const LMatrix4d &mat); INLINE bool has_transform() const; + INLINE bool is_transform_2d() const; + INLINE void set_transform_2d(const LMatrix3d &mat); INLINE void set_transform(const LMatrix4d &mat); + INLINE LMatrix3d get_transform_2d() const; INLINE const LMatrix4d &get_transform() const; INLINE bool transform_is_identity() const; enum ComponentType { CT_invalid, - CT_translate, + CT_translate2d, + CT_translate3d, + CT_rotate2d, CT_rotx, CT_roty, CT_rotz, - CT_rotate, - CT_scale, + CT_rotate3d, + CT_scale2d, + CT_scale3d, CT_uniform_scale, - CT_matrix + CT_matrix3, + CT_matrix4 }; INLINE int get_num_components() const; INLINE ComponentType get_component_type(int n) const; INLINE double get_component_number(int n) const; - INLINE const LVector3d &get_component_vector(int n) const; - INLINE const LMatrix4d &get_component_matrix(int n) const; + INLINE const LVecBase2d &get_component_vec2(int n) const; + INLINE const LVecBase3d &get_component_vec3(int n) const; + INLINE const LMatrix3d &get_component_mat3(int n) const; + INLINE const LMatrix4d &get_component_mat4(int n) const; void write(ostream &out, int indent_level) const; protected: void internal_clear_transform(); + void internal_add_matrix(const LMatrix3d &mat); void internal_add_matrix(const LMatrix4d &mat); + INLINE void internal_set_transform(const LMatrix3d &mat); INLINE void internal_set_transform(const LMatrix4d &mat); virtual void transform_changed(); @@ -91,15 +109,18 @@ private: ComponentType _type; double _number; - LVector3d *_vector; - LMatrix4d *_matrix; + LVecBase2d *_vec2; + LVecBase3d *_vec3; + LMatrix3d *_mat3; + LMatrix4d *_mat4; }; + bool _is_transform_2d; typedef pvector Components; Components _components; LMatrix4d _transform; }; -#include "eggTransform3d.I" +#include "eggTransform.I" #endif diff --git a/panda/src/egg/eggTransform3d.I b/panda/src/egg/eggTransform3d.I deleted file mode 100644 index 887c697c37..0000000000 --- a/panda/src/egg/eggTransform3d.I +++ /dev/null @@ -1,240 +0,0 @@ -// Filename: eggTransform3d.I -// Created by: drose (21Jun02) -// -//////////////////////////////////////////////////////////////////// -// -// PANDA 3D SOFTWARE -// Copyright (c) 2001 - 2004, Disney Enterprises, Inc. All rights reserved -// -// All use of this software is subject to the terms of the Panda 3d -// Software license. You should have received a copy of this license -// along with this source code; you will also find a current copy of -// the license at http://etc.cmu.edu/panda3d/docs/license/ . -// -// To contact the maintainers of this program write to -// panda3d-general@lists.sourceforge.net . -// -//////////////////////////////////////////////////////////////////// - -//////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::Component::Constructor -// Access: Public -// Description: -//////////////////////////////////////////////////////////////////// -INLINE EggTransform3d::Component:: -Component(EggTransform3d::ComponentType type, double number) : - _type(type), - _number(number) -{ - _vector = (LVector3d *)NULL; - _matrix = (LMatrix4d *)NULL; -} - -//////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::Component::Copy Constructor -// Access: Public -// Description: -//////////////////////////////////////////////////////////////////// -INLINE EggTransform3d::Component:: -Component(const EggTransform3d::Component ©) : - _type(copy._type), - _number(copy._number) -{ - _vector = (LVector3d *)NULL; - _matrix = (LMatrix4d *)NULL; - if (copy._vector != (LVector3d *)NULL) { - _vector = new LVector3d(*copy._vector); - } - if (copy._matrix != (LMatrix4d *)NULL) { - _matrix = new LMatrix4d(*copy._matrix); - } -} - -//////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::Component::Copy Assignment Operator -// Access: Public -// Description: -//////////////////////////////////////////////////////////////////// -INLINE void EggTransform3d::Component:: -operator = (const EggTransform3d::Component ©) { - _type = copy._type; - _number = copy._number; - if (_vector != (LVector3d *)NULL) { - delete _vector; - _vector = (LVector3d *)NULL; - } - if (_matrix != (LMatrix4d *)NULL) { - delete _matrix; - _matrix = (LMatrix4d *)NULL; - } - if (copy._vector != (LVector3d *)NULL) { - _vector = new LVector3d(*copy._vector); - } - if (copy._matrix != (LMatrix4d *)NULL) { - _matrix = new LMatrix4d(*copy._matrix); - } -} - -//////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::Component::Destructor -// Access: Public -// Description: -//////////////////////////////////////////////////////////////////// -INLINE EggTransform3d::Component:: -~Component() { - if (_vector != (LVector3d *)NULL) { - delete _vector; - } - if (_matrix != (LMatrix4d *)NULL) { - delete _matrix; - } -} - -//////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::clear_transform -// Access: Public -// Description: Resets the transform to empty, identity. -//////////////////////////////////////////////////////////////////// -INLINE void EggTransform3d:: -clear_transform() { - internal_clear_transform(); - transform_changed(); -} - -//////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::add_matrix -// Access: Public -// Description: Appends an arbitrary 4x4 matrix to the current -// transform. -//////////////////////////////////////////////////////////////////// -INLINE void EggTransform3d:: -add_matrix(const LMatrix4d &mat) { - internal_add_matrix(mat); - transform_changed(); -} - -//////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::has_transform -// Access: Public -// Description: Returns true if the transform is nonempty, false if -// it is empty (no transform components have been -// added). -//////////////////////////////////////////////////////////////////// -INLINE bool EggTransform3d:: -has_transform() const { - return !_components.empty(); -} - -//////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::set_transform -// Access: Public -// Description: Sets the overall transform as a 4x4 matrix. This -// completely replaces whatever componentwise transform -// may have been defined. -//////////////////////////////////////////////////////////////////// -INLINE void EggTransform3d:: -set_transform(const LMatrix4d &mat) { - internal_set_transform(mat); - transform_changed(); -} - -//////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::get_transform -// Access: Public -// Description: Returns the overall transform as a 4x4 matrix. -//////////////////////////////////////////////////////////////////// -INLINE const LMatrix4d &EggTransform3d:: -get_transform() const { - return _transform; -} - -//////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::transform_is_identity -// Access: Public -// Description: Returns true if the described transform is identity, -// false otherwise. -//////////////////////////////////////////////////////////////////// -INLINE bool EggTransform3d:: -transform_is_identity() const { - return _components.empty() || - _transform.almost_equal(LMatrix4d::ident_mat(), 0.0001); -} - -//////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::get_num_components -// Access: Public -// Description: Returns the number of components that make up the -// transform. -//////////////////////////////////////////////////////////////////// -INLINE int EggTransform3d:: -get_num_components() const { - return _components.size(); -} - -//////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::get_component_type -// Access: Public -// Description: Returns the type of the nth component. -//////////////////////////////////////////////////////////////////// -INLINE EggTransform3d::ComponentType EggTransform3d:: -get_component_type(int n) const { - nassertr(n >= 0 && n < (int)_components.size(), CT_invalid); - return _components[n]._type; -} - -//////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::get_component_number -// Access: Public -// Description: Returns the solitary number associated with the nth -// component. In the case of a rotation, this is the -// angle in degrees to rotate; in the case of uniform -// scale, this is the amount of the scale. Other types -// do not use this property. -//////////////////////////////////////////////////////////////////// -INLINE double EggTransform3d:: -get_component_number(int n) const { - nassertr(n >= 0 && n < (int)_components.size(), 0.0); - return _components[n]._number; -} - -//////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::get_component_vector -// Access: Public -// Description: Returns the 3-component vector associated with the -// nth component. This may be the translate vector, -// rotate axis, or non-uniform scale. It is an error to -// call this if the component type does not use a vector -// property. -//////////////////////////////////////////////////////////////////// -INLINE const LVector3d &EggTransform3d:: -get_component_vector(int n) const { - nassertr(n >= 0 && n < (int)_components.size(), LVector3d::zero()); - nassertr(_components[n]._vector != (LVector3d *)NULL, LVector3d::zero()); - return *_components[n]._vector; -} - -//////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::get_component_matrix -// Access: Public -// Description: Returns the 4x4 matrix associated with the nth -// component. It is an error to call this if the -// component type is not CT_matrix. -//////////////////////////////////////////////////////////////////// -INLINE const LMatrix4d &EggTransform3d:: -get_component_matrix(int n) const { - nassertr(n >= 0 && n < (int)_components.size(), LMatrix4d::ident_mat()); - nassertr(_components[n]._matrix != (LMatrix4d *)NULL, LMatrix4d::ident_mat()); - return *_components[n]._matrix; -} - -//////////////////////////////////////////////////////////////////// -// Function: EggTransform3d::internal_set_transform -// Access: Protected -// Description: Sets the overall transform without calling -// transform_changed(). -//////////////////////////////////////////////////////////////////// -INLINE void EggTransform3d:: -internal_set_transform(const LMatrix4d &mat) { - internal_clear_transform(); - internal_add_matrix(mat); -} diff --git a/panda/src/egg/eggVertex.I b/panda/src/egg/eggVertex.I index f63b3a2216..da570f1368 100644 --- a/panda/src/egg/eggVertex.I +++ b/panda/src/egg/eggVertex.I @@ -211,7 +211,7 @@ has_uv() const { // multitexturing; see get_uv(name) for the interface // that supports multitexturing. //////////////////////////////////////////////////////////////////// -INLINE const TexCoordd &EggVertex:: +INLINE TexCoordd EggVertex:: get_uv() const { nassertr(has_uv(), TexCoordd::zero()); return get_uv(""); diff --git a/panda/src/egg/eggVertex.cxx b/panda/src/egg/eggVertex.cxx index 2bd246b9ff..c6c87d89a8 100644 --- a/panda/src/egg/eggVertex.cxx +++ b/panda/src/egg/eggVertex.cxx @@ -117,12 +117,34 @@ EggVertex:: // Function: EggVertex::has_uv // Access: Published // Description: Returns true if the vertex has the named UV -// coordinate pair, false otherwise. +// coordinate pair, and the named UV coordinate pair is +// 2-d, false otherwise. //////////////////////////////////////////////////////////////////// bool EggVertex:: has_uv(const string &name) const { UVMap::const_iterator ui = _uv_map.find(name); - return (ui != _uv_map.end()); + if (ui != _uv_map.end()) { + EggVertexUV *uv_obj = (*ui).second; + return !uv_obj->has_w(); + } + return false; +} + +//////////////////////////////////////////////////////////////////// +// Function: EggVertex::has_uvw +// Access: Published +// Description: Returns true if the vertex has the named UV +// coordinate triple, and the named UV coordinate triple is +// 3-d, false otherwise. +//////////////////////////////////////////////////////////////////// +bool EggVertex:: +has_uvw(const string &name) const { + UVMap::const_iterator ui = _uv_map.find(name); + if (ui != _uv_map.end()) { + EggVertexUV *uv_obj = (*ui).second; + return uv_obj->has_w(); + } + return false; } //////////////////////////////////////////////////////////////////// @@ -132,13 +154,27 @@ has_uv(const string &name) const { // vertex. It is an error to call this if has_uv(name) // returned false. //////////////////////////////////////////////////////////////////// -const TexCoordd &EggVertex:: +TexCoordd EggVertex:: get_uv(const string &name) const { UVMap::const_iterator ui = _uv_map.find(name); nassertr(ui != _uv_map.end(), TexCoordd::zero()); return (*ui).second->get_uv(); } +//////////////////////////////////////////////////////////////////// +// Function: EggVertex::get_uvw +// Access: Published +// Description: Returns the named UV coordinate triple on the vertex. +// vertex. It is an error to call this if has_uvw(name) +// returned false. +//////////////////////////////////////////////////////////////////// +const TexCoord3d &EggVertex:: +get_uvw(const string &name) const { + UVMap::const_iterator ui = _uv_map.find(name); + nassertr(ui != _uv_map.end(), TexCoord3d::zero()); + return (*ui).second->get_uvw(); +} + //////////////////////////////////////////////////////////////////// // Function: EggVertex::set_uv // Access: Published @@ -160,6 +196,28 @@ set_uv(const string &name, const TexCoordd &uv) { nassertv(get_uv(name) == uv); } +//////////////////////////////////////////////////////////////////// +// Function: EggVertex::set_uvw +// Access: Published +// Description: Sets the indicated UV coordinate triple on the vertex. +// This replaces any UV coordinate pair or triple with +// the same name already on the vertex, but preserves UV +// morphs. +//////////////////////////////////////////////////////////////////// +void EggVertex:: +set_uvw(const string &name, const TexCoord3d &uvw) { + PT(EggVertexUV) &uv_obj = _uv_map[name]; + + if (uv_obj.is_null()) { + uv_obj = new EggVertexUV(name, uvw); + } else { + uv_obj = new EggVertexUV(*uv_obj); + uv_obj->set_uvw(uvw); + } + + nassertv(get_uvw(name) == uvw); +} + //////////////////////////////////////////////////////////////////// // Function: EggVertex::get_uv_obj // Access: Published @@ -257,7 +315,7 @@ write(ostream &out, int indent_level) const { EggAttributes::write(out, indent_level+2); - _dxyzs.write(out, indent_level+2); + _dxyzs.write(out, indent_level + 2, "", 3); // If the vertex is referenced by one or more groups, write that as // a helpful comment. diff --git a/panda/src/egg/eggVertex.h b/panda/src/egg/eggVertex.h index 791ce6d980..4d7ef22d93 100644 --- a/panda/src/egg/eggVertex.h +++ b/panda/src/egg/eggVertex.h @@ -82,12 +82,15 @@ PUBLISHED: INLINE LPoint4d get_pos4() const; INLINE bool has_uv() const; - INLINE const TexCoordd &get_uv() const; + INLINE TexCoordd get_uv() const; INLINE void set_uv(const TexCoordd &texCoord); INLINE void clear_uv(); bool has_uv(const string &name) const; - const TexCoordd &get_uv(const string &name) const; + bool has_uvw(const string &name) const; + TexCoordd get_uv(const string &name) const; + const TexCoord3d &get_uvw(const string &name) const; void set_uv(const string &name, const TexCoordd &texCoord); + void set_uvw(const string &name, const TexCoord3d &texCoord); EggVertexUV *get_uv_obj(const string &name) const; void set_uv_obj(EggVertexUV *vertex_uv); void clear_uv(const string &name); diff --git a/panda/src/egg/eggVertexPool.cxx b/panda/src/egg/eggVertexPool.cxx index 24d29c74db..3295ed8889 100644 --- a/panda/src/egg/eggVertexPool.cxx +++ b/panda/src/egg/eggVertexPool.cxx @@ -295,14 +295,17 @@ has_uvs() const { // Function: EggVertexPool::get_uv_names // Access: Public // Description: Returns the list of UV names that are defined by any -// vertices in the pool. Also returns the subset of UV -// names that define the tangent and binormal. It is -// the user's responsibility to clear both vectors -// before calling this method. +// vertices in the pool, as well as the subset of UV +// names that actually define 3-d texture coordinates +// ("uvw_names"). Also returns the subset of UV/UVW +// names that define a tangent and binormal. It is the +// user's responsibility to clear both vectors before +// calling this method. //////////////////////////////////////////////////////////////////// void EggVertexPool:: -get_uv_names(vector_string &uv_names, vector_string &tbn_names) const { - pset uv_names_set, tbn_names_set; +get_uv_names(vector_string &uv_names, vector_string &uvw_names, + vector_string &tbn_names) const { + pset uv_names_set, uvw_names_set, tbn_names_set; IndexVertices::const_iterator ivi; for (ivi = _index_vertices.begin(); ivi != _index_vertices.end(); ++ivi) { EggVertex *vertex = (*ivi).second; @@ -310,6 +313,9 @@ get_uv_names(vector_string &uv_names, vector_string &tbn_names) const { for (uvi = vertex->uv_begin(); uvi != vertex->uv_end(); ++uvi) { EggVertexUV *uv_obj = (*uvi); uv_names_set.insert(uv_obj->get_name()); + if (uv_obj->has_w()) { + uvw_names_set.insert(uv_obj->get_name()); + } if (uv_obj->has_tangent() && uv_obj->has_binormal()) { tbn_names_set.insert(uv_obj->get_name()); } @@ -320,6 +326,9 @@ get_uv_names(vector_string &uv_names, vector_string &tbn_names) const { for (si = uv_names_set.begin(); si != uv_names_set.end(); ++si) { uv_names.push_back(*si); } + for (si = uvw_names_set.begin(); si != uvw_names_set.end(); ++si) { + uvw_names.push_back(*si); + } for (si = tbn_names_set.begin(); si != tbn_names_set.end(); ++si) { tbn_names.push_back(*si); } diff --git a/panda/src/egg/eggVertexPool.h b/panda/src/egg/eggVertexPool.h index c1c733ef29..eace35a9fc 100644 --- a/panda/src/egg/eggVertexPool.h +++ b/panda/src/egg/eggVertexPool.h @@ -98,7 +98,8 @@ PUBLISHED: bool has_colors() const; bool has_nonwhite_colors() const; bool has_uvs() const; - void get_uv_names(vector_string &uv_names, vector_string &tbn_names) const; + void get_uv_names(vector_string &uv_names, vector_string &uvw_names, + vector_string &tbn_names) const; public: // Can be used to traverse all the vertices in index number order. diff --git a/panda/src/egg/eggVertexUV.I b/panda/src/egg/eggVertexUV.I index c654658bde..150b587fd0 100755 --- a/panda/src/egg/eggVertexUV.I +++ b/panda/src/egg/eggVertexUV.I @@ -17,24 +17,92 @@ //////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////// +// Function: EggVertexUV::set_name +// Access: Public +// Description: +//////////////////////////////////////////////////////////////////// +INLINE void EggVertexUV:: +set_name(const string &name) { + if (name == "default") { + clear_name(); + } else { + Namable::set_name(name); + } +} + +//////////////////////////////////////////////////////////////////// +// Function: EggVertexUV::get_num_dimensions +// Access: Published +// Description: Returns the number of components of the texture +// coordinate set. This is either 2 (the normal case) +// or 3 (for a 3-d texture coordinate). +//////////////////////////////////////////////////////////////////// +INLINE int EggVertexUV:: +get_num_dimensions() const { + return has_w() ? 3 : 2; +} + +//////////////////////////////////////////////////////////////////// +// Function: EggVertexUV::has_w +// Access: Published +// Description: Returns true if the texture coordinate has a third, w +// component, false if it is just a normal 2-d texture +// coordinate. +//////////////////////////////////////////////////////////////////// +INLINE bool EggVertexUV:: +has_w() const { + return (_flags & F_has_w) != 0; +} + //////////////////////////////////////////////////////////////////// // Function: EggVertexUV::get_uv // Access: Published -// Description: Returns the texture coordinate pair. +// Description: Returns the texture coordinate pair, if +// get_num_dimensions() is 2. //////////////////////////////////////////////////////////////////// -INLINE const TexCoordd &EggVertexUV:: +INLINE TexCoordd EggVertexUV:: get_uv() const { - return _uv; + nassertr(!has_w(), TexCoordd::zero()); + return TexCoordd(_uvw[0], _uvw[1]); +} + +//////////////////////////////////////////////////////////////////// +// Function: EggVertexUV::get_uvw +// Access: Published +// Description: Returns the texture coordinate triple, if +// get_num_dimensions() is 3. This is also legal to +// call if get_num_dimensions() is 2 (but the last +// dimension will be zero). +//////////////////////////////////////////////////////////////////// +INLINE const TexCoord3d &EggVertexUV:: +get_uvw() const { + return _uvw; } //////////////////////////////////////////////////////////////////// // Function: EggVertexUV::set_uv // Access: Published -// Description: Sets the texture coordinate pair. +// Description: Sets the texture coordinate pair. This makes the +// texture coordinate a 2-d texture coordinate, which is +// the usual case. //////////////////////////////////////////////////////////////////// INLINE void EggVertexUV:: set_uv(const TexCoordd &uv) { - _uv = uv; + _uvw.set(uv[0], uv[1], 0.0); + _flags &= ~F_has_w; +} + +//////////////////////////////////////////////////////////////////// +// Function: EggVertexUV::set_uvw +// Access: Published +// Description: Sets the texture coordinate triple. This makes the +// texture coordinate a 3-d texture coordinate. +//////////////////////////////////////////////////////////////////// +INLINE void EggVertexUV:: +set_uvw(const TexCoord3d &uvw) { + _uvw = uvw; + _flags |= F_has_w; } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/egg/eggVertexUV.cxx b/panda/src/egg/eggVertexUV.cxx index a1cc99cce7..f5e1d25396 100755 --- a/panda/src/egg/eggVertexUV.cxx +++ b/panda/src/egg/eggVertexUV.cxx @@ -32,8 +32,27 @@ EggVertexUV:: EggVertexUV(const string &name, const TexCoordd &uv) : EggNamedObject(name), _flags(0), - _uv(uv) + _uvw(uv[0], uv[1], 0.0) { + if (get_name() == "default") { + clear_name(); + } +} + +//////////////////////////////////////////////////////////////////// +// Function: EggVertexUV::Constructor +// Access: Published +// Description: +//////////////////////////////////////////////////////////////////// +EggVertexUV:: +EggVertexUV(const string &name, const TexCoord3d &uvw) : + EggNamedObject(name), + _flags(F_has_w), + _uvw(uvw) +{ + if (get_name() == "default") { + clear_name(); + } } //////////////////////////////////////////////////////////////////// @@ -48,7 +67,7 @@ EggVertexUV(const EggVertexUV ©) : _flags(copy._flags), _tangent(copy._tangent), _binormal(copy._binormal), - _uv(copy._uv) + _uvw(copy._uvw) { } @@ -64,7 +83,7 @@ operator = (const EggVertexUV ©) { _flags = copy._flags; _tangent = copy._tangent; _binormal = copy._binormal; - _uv = copy._uv; + _uvw = copy._uvw; return (*this); } @@ -109,12 +128,21 @@ write(ostream &out, int indent_level) const { inline_name += ' '; } - if (_duvs.empty() && _flags == 0) { - indent(out, indent_level) - << " " << inline_name << "{ " << get_uv() << " }\n"; + if (_duvs.empty() && (_flags & ~F_has_w) == 0) { + if (has_w()) { + indent(out, indent_level) + << " " << inline_name << "{ " << get_uvw() << " }\n"; + } else { + indent(out, indent_level) + << " " << inline_name << "{ " << get_uv() << " }\n"; + } } else { indent(out, indent_level) << " " << inline_name << "{\n"; - indent(out, indent_level+2) << get_uv() << "\n"; + if (has_w()) { + indent(out, indent_level+2) << get_uvw() << "\n"; + } else { + indent(out, indent_level+2) << get_uv() << "\n"; + } if (has_tangent()) { indent(out, indent_level + 2) << " { " << get_tangent() << " }\n"; @@ -123,7 +151,7 @@ write(ostream &out, int indent_level) const { indent(out, indent_level + 2) << " { " << get_binormal() << " }\n"; } - _duvs.write(out, indent_level+2); + _duvs.write(out, indent_level + 2, "", get_num_dimensions()); indent(out, indent_level) << "}\n"; } } @@ -141,7 +169,7 @@ compare_to(const EggVertexUV &other) const { return _flags - other._flags; } int compare; - compare = _uv.compare_to(other._uv, egg_parameters->_uv_threshold); + compare = _uvw.compare_to(other._uvw, egg_parameters->_uv_threshold); if (compare != 0) { return compare; } diff --git a/panda/src/egg/eggVertexUV.h b/panda/src/egg/eggVertexUV.h index 629eacef15..851a83ec7b 100755 --- a/panda/src/egg/eggVertexUV.h +++ b/panda/src/egg/eggVertexUV.h @@ -36,12 +36,19 @@ class EXPCL_PANDAEGG EggVertexUV : public EggNamedObject { PUBLISHED: EggVertexUV(const string &name, const TexCoordd &uv); + EggVertexUV(const string &name, const TexCoord3d &uvw); EggVertexUV(const EggVertexUV ©); EggVertexUV &operator = (const EggVertexUV ©); virtual ~EggVertexUV(); - INLINE const TexCoordd &get_uv() const; + INLINE void set_name(const string &name); + + INLINE int get_num_dimensions() const; + INLINE bool has_w() const; + INLINE TexCoordd get_uv() const; + INLINE const TexCoord3d &get_uvw() const; INLINE void set_uv(const TexCoordd &texCoord); + INLINE void set_uvw(const TexCoord3d &texCoord); INLINE bool has_tangent() const; INLINE const Normald &get_tangent() const; @@ -64,12 +71,13 @@ private: enum Flags { F_has_tangent = 0x001, F_has_binormal = 0x002, + F_has_w = 0x004, }; int _flags; Normald _tangent; Normald _binormal; - TexCoordd _uv; + TexCoord3d _uvw; public: static TypeHandle get_class_type() { diff --git a/panda/src/egg/egg_composite2.cxx b/panda/src/egg/egg_composite2.cxx index 9fd5537bca..03edeb8a75 100644 --- a/panda/src/egg/egg_composite2.cxx +++ b/panda/src/egg/egg_composite2.cxx @@ -12,7 +12,7 @@ #include "eggTable.cxx" #include "eggTexture.cxx" #include "eggTextureCollection.cxx" -#include "eggTransform3d.cxx" +#include "eggTransform.cxx" #include "eggTriangleFan.cxx" #include "eggTriangleStrip.cxx" #include "eggUserData.cxx" diff --git a/panda/src/egg/lexer.cxx.prebuilt b/panda/src/egg/lexer.cxx.prebuilt index 9867a9bd56..157164aa1d 100644 --- a/panda/src/egg/lexer.cxx.prebuilt +++ b/panda/src/egg/lexer.cxx.prebuilt @@ -1,2965 +1,2944 @@ -#define yy_create_buffer eggyy_create_buffer -#define yy_delete_buffer eggyy_delete_buffer -#define yy_scan_buffer eggyy_scan_buffer -#define yy_scan_string eggyy_scan_string -#define yy_scan_bytes eggyy_scan_bytes -#define yy_flex_debug eggyy_flex_debug -#define yy_init_buffer eggyy_init_buffer -#define yy_flush_buffer eggyy_flush_buffer -#define yy_load_buffer_state eggyy_load_buffer_state -#define yy_switch_to_buffer eggyy_switch_to_buffer -#define yyin eggyyin -#define yyleng eggyyleng -#define yylex eggyylex -#define yyout eggyyout -#define yyrestart eggyyrestart -#define yytext eggyytext -#define yywrap eggyywrap - -#line 20 "lex.yy.c" -/* A lexical scanner generated by flex */ - -/* Scanner skeleton version: - * $Header$ - */ - -#define FLEX_SCANNER -#define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 - -#include -#include - -/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ -#ifdef c_plusplus -#ifndef __cplusplus -#define __cplusplus -#endif -#endif - - -#ifdef __cplusplus - -#include -#ifndef _WIN32 -#endif - -/* Use prototypes in function declarations. */ -#define YY_USE_PROTOS - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -#if __STDC__ - -#define YY_USE_PROTOS -#define YY_USE_CONST - -#endif /* __STDC__ */ -#endif /* ! __cplusplus */ - -#ifdef __TURBOC__ - #pragma warn -rch - #pragma warn -use -#include -#include -#define YY_USE_CONST -#define YY_USE_PROTOS -#endif - -#ifdef YY_USE_CONST -#define yyconst const -#else -#define yyconst -#endif - - -#ifdef YY_USE_PROTOS -#define YY_PROTO(proto) proto -#else -#define YY_PROTO(proto) () -#endif - - -/* Returned upon end-of-file. */ -#define YY_NULL 0 - -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. - */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) - -/* Enter a start condition. This macro really ought to take a parameter, - * but we do it the disgusting crufty way forced on us by the ()-less - * definition of BEGIN. - */ -#define BEGIN yy_start = 1 + 2 * - -/* Translate the current start state into a value that can be later handed - * to BEGIN to return to the state. The YYSTATE alias is for lex - * compatibility. - */ -#define YY_START ((yy_start - 1) / 2) -#define YYSTATE YY_START - -/* Action number for EOF rule of a given start state. */ -#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - -/* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE yyrestart( yyin ) - -#define YY_END_OF_BUFFER_CHAR 0 - -/* Size of default input buffer. */ -#define YY_BUF_SIZE 16384 - -typedef struct yy_buffer_state *YY_BUFFER_STATE; - -extern int yyleng; -extern FILE *yyin, *yyout; - -#define EOB_ACT_CONTINUE_SCAN 0 -#define EOB_ACT_END_OF_FILE 1 -#define EOB_ACT_LAST_MATCH 2 - -/* The funky do-while in the following #define is used to turn the definition - * int a single C statement (which needs a semi-colon terminator). This - * avoids problems with code like: - * - * if ( condition_holds ) - * yyless( 5 ); - * else - * do_something_else(); - * - * Prior to using the do-while the compiler would get upset at the - * "else" because it interpreted the "if" statement as being all - * done when it reached the ';' after the yyless() call. - */ - -/* Return all but the first 'n' matched characters back to the input stream. */ - -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - *yy_cp = yy_hold_char; \ - YY_RESTORE_YY_MORE_OFFSET \ - yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \ - YY_DO_BEFORE_ACTION; /* set up yytext again */ \ - } \ - while ( 0 ) - -#define unput(c) yyunput( c, yytext_ptr ) - -/* The following is because we cannot portably get our hands on size_t - * (without autoconf's help, which isn't available because we want - * flex-generated scanners to compile on their own). - */ -typedef unsigned int yy_size_t; - - -struct yy_buffer_state - { - FILE *yy_input_file; - - char *yy_ch_buf; /* input buffer */ - char *yy_buf_pos; /* current position in input buffer */ - - /* Size of input buffer in bytes, not including room for EOB - * characters. - */ - yy_size_t yy_buf_size; - - /* Number of characters read into yy_ch_buf, not including EOB - * characters. - */ - int yy_n_chars; - - /* Whether we "own" the buffer - i.e., we know we created it, - * and can realloc() it to grow it, and should free() it to - * delete it. - */ - int yy_is_our_buffer; - - /* Whether this is an "interactive" input source; if so, and - * if we're using stdio for input, then we want to use getc() - * instead of fread(), to make sure we stop fetching input after - * each newline. - */ - int yy_is_interactive; - - /* Whether we're considered to be at the beginning of a line. - * If so, '^' rules will be active on the next match, otherwise - * not. - */ - int yy_at_bol; - - /* Whether to try to fill the input buffer when we reach the - * end of it. - */ - int yy_fill_buffer; - - int yy_buffer_status; -#define YY_BUFFER_NEW 0 -#define YY_BUFFER_NORMAL 1 - /* When an EOF's been seen but there's still some text to process - * then we mark the buffer as YY_EOF_PENDING, to indicate that we - * shouldn't try reading from the input source any more. We might - * still have a bunch of tokens to match, though, because of - * possible backing-up. - * - * When we actually see the EOF, we change the status to "new" - * (via yyrestart()), so that the user can continue scanning by - * just pointing yyin at a new input file. - */ -#define YY_BUFFER_EOF_PENDING 2 - }; - -static YY_BUFFER_STATE yy_current_buffer = 0; - -/* We provide macros for accessing buffer states in case in the - * future we want to put the buffer states in a more general - * "scanner state". - */ -#define YY_CURRENT_BUFFER yy_current_buffer - - -/* yy_hold_char holds the character lost when yytext is formed. */ -static char yy_hold_char; - -static int yy_n_chars; /* number of characters read into yy_ch_buf */ - - -int yyleng; - -/* Points to current character in buffer. */ -static char *yy_c_buf_p = (char *) 0; -static int yy_init = 1; /* whether we need to initialize */ -static int yy_start = 0; /* start state number */ - -/* Flag which is used to allow yywrap()'s to do buffer switches - * instead of setting up a fresh yyin. A bit of a hack ... - */ -static int yy_did_buffer_switch_on_eof; - -void yyrestart YY_PROTO(( FILE *input_file )); - -void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer )); -void yy_load_buffer_state YY_PROTO(( void )); -YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size )); -void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b )); -void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file )); -void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b )); -#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer ) - -YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size )); -YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str )); -YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len )); - -static void *yy_flex_alloc YY_PROTO(( yy_size_t )); -static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )); -static void yy_flex_free YY_PROTO(( void * )); - -#define yy_new_buffer yy_create_buffer - -#define yy_set_interactive(is_interactive) \ - { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_is_interactive = is_interactive; \ - } - -#define yy_set_bol(at_bol) \ - { \ - if ( ! yy_current_buffer ) \ - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ - yy_current_buffer->yy_at_bol = at_bol; \ - } - -#define YY_AT_BOL() (yy_current_buffer->yy_at_bol) - -typedef unsigned char YY_CHAR; -FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; -typedef int yy_state_type; -extern char *yytext; -#define yytext_ptr yytext - -static yy_state_type yy_get_previous_state YY_PROTO(( void )); -static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state )); -static int yy_get_next_buffer YY_PROTO(( void )); -static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); - -/* Done after the current pattern has been matched and before the - * corresponding action - sets up yytext. - */ -#define YY_DO_BEFORE_ACTION \ - yytext_ptr = yy_bp; \ - yyleng = (int) (yy_cp - yy_bp); \ - yy_hold_char = *yy_cp; \ - *yy_cp = '\0'; \ - yy_c_buf_p = yy_cp; - -#define YY_NUM_RULES 98 -#define YY_END_OF_BUFFER 99 -static yyconst short int yy_accept[557] = - { 0, - 0, 0, 99, 97, 2, 1, 96, 97, 97, 97, - 97, 90, 90, 97, 97, 97, 5, 97, 1, 97, - 90, 97, 90, 4, 3, 90, 92, 97, 91, 97, - 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, - 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, - 97, 97, 3, 3, 92, 97, 90, 91, 97, 97, - 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, - 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, - 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, - 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, - - 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, - 66, 97, 97, 97, 94, 97, 95, 97, 97, 97, - 97, 97, 97, 97, 97, 97, 97, 18, 97, 97, - 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, - 97, 32, 97, 97, 97, 97, 97, 97, 97, 97, - 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, - 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, - 97, 97, 97, 97, 97, 97, 97, 81, 97, 97, - 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, - 97, 97, 97, 97, 97, 24, 97, 97, 97, 97, - - 22, 97, 97, 97, 97, 97, 31, 97, 97, 97, - 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, - 97, 97, 97, 97, 52, 97, 97, 97, 97, 97, - 97, 97, 97, 97, 97, 97, 67, 97, 97, 97, - 97, 97, 97, 97, 97, 78, 97, 97, 97, 97, - 97, 97, 93, 97, 97, 97, 97, 97, 97, 97, - 97, 97, 97, 97, 19, 97, 97, 97, 97, 23, - 97, 28, 97, 97, 97, 97, 97, 97, 37, 38, - 97, 97, 97, 43, 97, 97, 97, 97, 97, 97, - 97, 53, 97, 55, 56, 57, 97, 97, 97, 97, - - 97, 97, 97, 97, 97, 97, 97, 97, 74, 97, - 77, 97, 97, 97, 97, 97, 97, 93, 97, 7, - 97, 97, 97, 12, 97, 97, 97, 97, 97, 97, - 97, 21, 26, 97, 97, 30, 97, 97, 33, 34, - 97, 97, 42, 97, 97, 97, 97, 48, 97, 97, - 97, 97, 97, 97, 60, 97, 97, 97, 65, 97, - 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, - 97, 97, 97, 97, 97, 11, 13, 97, 97, 97, - 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, - 44, 97, 97, 97, 97, 97, 97, 54, 58, 59, - - 97, 97, 63, 97, 97, 97, 97, 97, 97, 97, - 97, 97, 97, 97, 97, 84, 97, 97, 97, 97, - 97, 97, 97, 14, 15, 97, 97, 97, 20, 97, - 97, 35, 97, 97, 40, 41, 97, 97, 97, 97, - 97, 51, 97, 62, 97, 68, 69, 70, 97, 97, - 97, 97, 79, 80, 82, 83, 97, 97, 97, 97, - 97, 97, 10, 97, 97, 25, 97, 97, 36, 39, - 97, 97, 97, 97, 97, 61, 97, 71, 97, 97, - 97, 97, 97, 97, 97, 88, 97, 97, 8, 97, - 16, 97, 97, 97, 97, 97, 97, 97, 97, 97, - - 72, 73, 97, 97, 97, 97, 87, 97, 97, 97, - 97, 97, 29, 45, 97, 47, 49, 50, 97, 97, - 97, 85, 86, 97, 6, 97, 97, 97, 97, 97, - 75, 97, 89, 97, 97, 97, 46, 97, 97, 97, - 97, 97, 97, 76, 97, 97, 97, 97, 9, 97, - 97, 64, 17, 97, 27, 0 - } ; - -static yyconst int yy_ec[256] = - { 0, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, - 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 1, 4, 1, 5, 1, 1, 1, 1, - 1, 6, 7, 1, 8, 9, 10, 11, 12, 13, - 14, 15, 13, 13, 13, 13, 13, 1, 1, 16, - 1, 17, 1, 1, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, - 1, 1, 1, 1, 18, 1, 19, 20, 21, 22, - - 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, - 43, 44, 45, 1, 45, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1 - } ; - -static yyconst int yy_meta[46] = - { 0, - 1, 2, 3, 2, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 2 - } ; - -static yyconst short int yy_base[562] = - { 0, - 0, 44, 663, 0, 664, 0, 664, 8, 81, 22, - 18, 100, 19, 123, 630, 642, 664, 0, 0, 29, - 30, 628, 51, 0, 65, 68, 14, 159, 164, 61, - 91, 170, 43, 623, 631, 625, 623, 623, 70, 68, - 66, 86, 621, 93, 175, 181, 128, 111, 629, 628, - 619, 626, 136, 0, 18, 207, 213, 0, 605, 629, - 45, 615, 627, 612, 102, 627, 607, 605, 604, 607, - 614, 602, 597, 593, 603, 604, 595, 599, 597, 173, - 603, 596, 596, 594, 588, 603, 601, 587, 586, 593, - 598, 581, 100, 594, 597, 578, 596, 595, 578, 593, - - 584, 209, 568, 586, 176, 570, 578, 577, 588, 575, - 0, 574, 566, 570, 0, 589, 0, 572, 577, 567, - 563, 573, 558, 556, 562, 199, 555, 0, 552, 572, - 550, 551, 566, 562, 567, 539, 563, 558, 562, 540, - 561, 0, 547, 538, 543, 536, 550, 538, 146, 548, - 546, 538, 548, 544, 543, 527, 532, 520, 545, 542, - 195, 528, 529, 519, 535, 518, 525, 537, 528, 48, - 520, 519, 526, 174, 532, 516, 515, 0, 514, 513, - 506, 538, 500, 518, 517, 519, 502, 507, 530, 512, - 507, 510, 499, 509, 513, 0, 510, 497, 508, 502, - - 0, 508, 493, 506, 496, 487, 0, 481, 500, 480, - 480, 499, 498, 478, 486, 482, 494, 491, 472, 487, - 471, 487, 467, 479, 0, 486, 464, 484, 483, 482, - 471, 79, 474, 469, 474, 471, 0, 470, 465, 452, - 465, 452, 471, 455, 469, 0, 452, 451, 450, 449, - 458, 461, 231, 443, 461, 444, 445, 452, 457, 451, - 450, 439, 438, 442, 0, 436, 448, 449, 448, 0, - 437, 0, 440, 445, 439, 428, 442, 441, 0, 0, - 430, 414, 438, 0, 424, 194, 415, 435, 419, 420, - 416, 0, 425, 0, 0, 0, 416, 410, 428, 412, - - 411, 416, 424, 408, 402, 402, 399, 134, 0, 411, - 0, 397, 396, 395, 394, 389, 398, 0, 408, 0, - 409, 408, 409, 0, 408, 401, 385, 399, 389, 399, - 389, 0, 0, 397, 398, 0, 393, 394, 0, 0, - 395, 221, 0, 396, 373, 372, 372, 0, 384, 381, - 375, 389, 388, 387, 0, 382, 377, 120, 0, 363, - 362, 376, 372, 364, 377, 365, 357, 356, 355, 354, - 230, 363, 350, 352, 357, 0, 0, 369, 368, 352, - 364, 359, 364, 340, 357, 361, 354, 346, 358, 357, - 0, 337, 336, 328, 347, 344, 351, 0, 0, 0, - - 344, 349, 0, 332, 347, 346, 345, 324, 324, 321, - 335, 340, 339, 338, 337, 0, 321, 319, 328, 319, - 313, 326, 330, 0, 0, 308, 307, 327, 0, 320, - 319, 0, 324, 323, 0, 0, 299, 314, 303, 304, - 309, 0, 317, 0, 301, 0, 0, 0, 315, 300, - 307, 224, 0, 0, 0, 0, 302, 295, 303, 239, - 286, 241, 0, 308, 301, 0, 287, 286, 0, 0, - 298, 301, 296, 280, 279, 0, 294, 0, 298, 297, - 294, 274, 280, 280, 292, 0, 271, 284, 0, 283, - 0, 268, 266, 286, 285, 280, 283, 282, 281, 270, - - 0, 0, 264, 259, 277, 276, 0, 287, 274, 258, - 246, 265, 0, 0, 264, 0, 0, 0, 248, 268, - 257, 0, 0, 266, 0, 244, 244, 238, 262, 251, - 0, 243, 0, 253, 227, 229, 0, 227, 242, 204, - 209, 174, 160, 0, 122, 76, 35, 32, 0, 21, - 1, 0, 0, 1, 0, 664, 266, 0, 269, 271, - 273 - } ; - -static yyconst short int yy_def[562] = - { 0, - 557, 557, 556, 558, 556, 559, 556, 558, 558, 558, - 558, 558, 12, 558, 558, 558, 556, 558, 559, 558, - 12, 558, 558, 558, 560, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 560, 561, 558, 558, 558, 29, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 253, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, - 558, 558, 558, 558, 558, 0, 556, 556, 556, 556, - 556 - } ; - -static yyconst short int yy_nxt[710] = - { 0, - 18, 5, 6, 7, 556, 556, 8, 9, 10, 11, - 12, 13, 13, 13, 13, 14, 20, 555, 21, 21, - 21, 21, 21, 24, 55, 55, 15, 25, 55, 55, - 554, 16, 23, 23, 23, 23, 23, 553, 18, 23, - 23, 23, 23, 23, 17, 5, 6, 7, 552, 18, - 8, 9, 10, 11, 12, 13, 13, 13, 13, 14, - 18, 23, 23, 23, 23, 23, 54, 551, 54, 76, - 15, 18, 77, 28, 120, 16, 121, 239, 23, 23, - 23, 23, 23, 59, 60, 240, 85, 61, 17, 20, - 28, 21, 21, 21, 21, 21, 83, 298, 88, 62, - - 86, 299, 84, 87, 89, 90, 550, 22, 26, 54, - 21, 21, 21, 21, 21, 94, 63, 95, 110, 27, - 64, 91, 28, 65, 92, 96, 157, 111, 112, 158, - 66, 125, 126, 113, 127, 107, 403, 54, 549, 54, - 404, 29, 30, 31, 32, 108, 33, 34, 35, 36, - 37, 38, 39, 40, 41, 42, 43, 364, 44, 45, - 46, 47, 48, 365, 49, 56, 56, 109, 214, 57, - 57, 57, 57, 57, 58, 58, 58, 58, 58, 97, - 54, 215, 58, 58, 58, 58, 58, 58, 67, 142, - 68, 548, 244, 143, 172, 98, 69, 99, 173, 102, - - 100, 70, 174, 103, 245, 71, 547, 72, 73, 144, - 104, 74, 75, 227, 345, 101, 105, 57, 57, 57, - 57, 57, 106, 57, 57, 57, 57, 57, 167, 192, - 346, 546, 193, 168, 389, 390, 228, 229, 230, 545, - 169, 318, 318, 318, 318, 318, 416, 481, 417, 318, - 318, 318, 318, 318, 318, 486, 487, 489, 544, 543, - 482, 490, 542, 418, 541, 419, 4, 4, 4, 19, - 19, 53, 53, 54, 54, 540, 539, 538, 537, 536, - 535, 534, 533, 532, 531, 530, 529, 528, 527, 526, - 525, 524, 523, 522, 521, 520, 519, 518, 517, 516, - - 515, 514, 513, 512, 511, 510, 509, 508, 507, 506, - 505, 504, 503, 502, 501, 500, 499, 498, 497, 496, - 495, 494, 493, 492, 491, 488, 485, 484, 483, 480, - 479, 478, 477, 476, 475, 474, 473, 472, 471, 470, - 469, 468, 467, 466, 465, 464, 463, 462, 461, 460, - 459, 458, 457, 456, 455, 454, 453, 452, 451, 450, - 449, 448, 447, 446, 445, 444, 443, 442, 441, 440, - 439, 438, 437, 436, 435, 434, 433, 432, 431, 430, - 429, 428, 427, 426, 425, 424, 423, 422, 421, 420, - 415, 414, 413, 412, 411, 410, 409, 408, 407, 406, - - 405, 402, 401, 400, 399, 398, 397, 396, 395, 394, - 393, 392, 391, 388, 387, 386, 385, 384, 383, 382, - 381, 380, 379, 378, 377, 376, 375, 374, 373, 372, - 371, 370, 369, 368, 367, 366, 363, 362, 361, 360, - 359, 358, 357, 356, 355, 354, 353, 352, 351, 350, - 349, 348, 347, 344, 343, 342, 341, 340, 339, 338, - 337, 336, 335, 334, 333, 332, 331, 330, 329, 328, - 327, 326, 325, 324, 323, 322, 321, 320, 319, 317, - 316, 315, 314, 313, 312, 311, 310, 309, 308, 307, - 306, 305, 304, 303, 302, 301, 300, 297, 296, 295, - - 294, 293, 292, 291, 290, 289, 288, 287, 286, 285, - 284, 283, 282, 281, 280, 279, 278, 277, 276, 275, - 274, 273, 272, 271, 270, 269, 268, 267, 266, 265, - 264, 263, 262, 261, 260, 259, 258, 257, 256, 255, - 254, 253, 252, 251, 250, 249, 248, 247, 246, 243, - 242, 241, 238, 237, 236, 235, 234, 233, 232, 231, - 226, 225, 224, 223, 222, 221, 220, 219, 218, 217, - 216, 213, 212, 211, 210, 209, 208, 207, 206, 205, - 204, 203, 202, 201, 200, 199, 198, 197, 196, 195, - 194, 191, 190, 189, 188, 187, 186, 185, 184, 183, - - 182, 181, 180, 179, 178, 177, 176, 175, 171, 170, - 166, 165, 164, 163, 162, 161, 160, 159, 156, 155, - 154, 153, 152, 151, 150, 149, 148, 147, 146, 145, - 141, 140, 139, 138, 137, 136, 135, 134, 133, 132, - 131, 130, 129, 128, 124, 123, 122, 119, 118, 117, - 116, 115, 114, 93, 82, 81, 80, 79, 78, 52, - 51, 50, 556, 3, 556, 556, 556, 556, 556, 556, - 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, - 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, - 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, - - 556, 556, 556, 556, 556, 556, 556, 556, 556 - } ; - -static yyconst short int yy_chk[710] = - { 0, - 558, 1, 1, 1, 0, 0, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 8, 554, 8, 8, - 8, 8, 8, 11, 27, 27, 1, 11, 55, 55, - 551, 1, 10, 10, 10, 10, 10, 550, 13, 20, - 20, 20, 20, 20, 1, 2, 2, 2, 548, 21, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 13, 23, 23, 23, 23, 23, 25, 547, 25, 33, - 2, 21, 33, 23, 61, 2, 61, 170, 26, 26, - 26, 26, 26, 30, 30, 170, 40, 30, 2, 9, - 26, 9, 9, 9, 9, 9, 39, 232, 41, 30, - - 40, 232, 39, 40, 41, 42, 546, 9, 12, 25, - 12, 12, 12, 12, 12, 44, 31, 44, 48, 12, - 31, 42, 12, 31, 42, 44, 93, 48, 48, 93, - 31, 65, 65, 48, 65, 47, 358, 53, 545, 53, - 358, 12, 14, 14, 14, 47, 14, 14, 14, 14, - 14, 14, 14, 14, 14, 14, 14, 308, 14, 14, - 14, 14, 14, 308, 14, 28, 28, 47, 149, 28, - 28, 28, 28, 28, 29, 29, 29, 29, 29, 45, - 53, 149, 29, 29, 29, 29, 29, 29, 32, 80, - 32, 543, 174, 80, 105, 45, 32, 45, 105, 46, - - 45, 32, 105, 46, 174, 32, 542, 32, 32, 80, - 46, 32, 32, 161, 286, 45, 46, 56, 56, 56, - 56, 56, 46, 57, 57, 57, 57, 57, 102, 126, - 286, 541, 126, 102, 342, 342, 161, 161, 161, 540, - 102, 253, 253, 253, 253, 253, 371, 452, 371, 253, - 253, 253, 253, 253, 253, 460, 460, 462, 539, 538, - 452, 462, 536, 371, 535, 371, 557, 557, 557, 559, - 559, 560, 560, 561, 561, 534, 532, 530, 529, 528, - 527, 526, 524, 521, 520, 519, 515, 512, 511, 510, - 509, 508, 506, 505, 504, 503, 500, 499, 498, 497, - - 496, 495, 494, 493, 492, 490, 488, 487, 485, 484, - 483, 482, 481, 480, 479, 477, 475, 474, 473, 472, - 471, 468, 467, 465, 464, 461, 459, 458, 457, 451, - 450, 449, 445, 443, 441, 440, 439, 438, 437, 434, - 433, 431, 430, 428, 427, 426, 423, 422, 421, 420, - 419, 418, 417, 415, 414, 413, 412, 411, 410, 409, - 408, 407, 406, 405, 404, 402, 401, 397, 396, 395, - 394, 393, 392, 390, 389, 388, 387, 386, 385, 384, - 383, 382, 381, 380, 379, 378, 375, 374, 373, 372, - 370, 369, 368, 367, 366, 365, 364, 363, 362, 361, - - 360, 357, 356, 354, 353, 352, 351, 350, 349, 347, - 346, 345, 344, 341, 338, 337, 335, 334, 331, 330, - 329, 328, 327, 326, 325, 323, 322, 321, 319, 317, - 316, 315, 314, 313, 312, 310, 307, 306, 305, 304, - 303, 302, 301, 300, 299, 298, 297, 293, 291, 290, - 289, 288, 287, 285, 283, 282, 281, 278, 277, 276, - 275, 274, 273, 271, 269, 268, 267, 266, 264, 263, - 262, 261, 260, 259, 258, 257, 256, 255, 254, 252, - 251, 250, 249, 248, 247, 245, 244, 243, 242, 241, - 240, 239, 238, 236, 235, 234, 233, 231, 230, 229, - - 228, 227, 226, 224, 223, 222, 221, 220, 219, 218, - 217, 216, 215, 214, 213, 212, 211, 210, 209, 208, - 206, 205, 204, 203, 202, 200, 199, 198, 197, 195, - 194, 193, 192, 191, 190, 189, 188, 187, 186, 185, - 184, 183, 182, 181, 180, 179, 177, 176, 175, 173, - 172, 171, 169, 168, 167, 166, 165, 164, 163, 162, - 160, 159, 158, 157, 156, 155, 154, 153, 152, 151, - 150, 148, 147, 146, 145, 144, 143, 141, 140, 139, - 138, 137, 136, 135, 134, 133, 132, 131, 130, 129, - 127, 125, 124, 123, 122, 121, 120, 119, 118, 116, - - 114, 113, 112, 110, 109, 108, 107, 106, 104, 103, - 101, 100, 99, 98, 97, 96, 95, 94, 92, 91, - 90, 89, 88, 87, 86, 85, 84, 83, 82, 81, - 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, - 69, 68, 67, 66, 64, 63, 62, 60, 59, 52, - 51, 50, 49, 43, 38, 37, 36, 35, 34, 22, - 16, 15, 3, 556, 556, 556, 556, 556, 556, 556, - 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, - 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, - 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, - - 556, 556, 556, 556, 556, 556, 556, 556, 556 - } ; - -static yy_state_type yy_last_accepting_state; -static char *yy_last_accepting_cpos; - -/* The intent behind this definition is that it'll catch - * any uses of REJECT which flex missed. - */ -#define REJECT reject_used_but_not_detected -#define yymore() yymore_used_but_not_detected -#define YY_MORE_ADJ 0 -#define YY_RESTORE_YY_MORE_OFFSET -char *yytext; -#line 1 "lexer.lxx" -#define INITIAL 0 -/* -// Filename: lexer.l -// Created by: drose (16Jan99) -// -//////////////////////////////////////////////////////////////////// -*/ -#line 9 "lexer.lxx" -#include "lexerDefs.h" -#include "parserDefs.h" -#include "config_egg.h" -#include "parser.h" - -#include -#include - -#include -#include - -extern "C" int eggyywrap(void); // declared below. - -static int yyinput(void); // declared by flex. - - -//////////////////////////////////////////////////////////////////// -// Static variables -//////////////////////////////////////////////////////////////////// - -// We'll increment line_number and col_number as we parse the file, so -// that we can report the position of an error. -static int line_number = 0; -static int col_number = 0; - -// current_line holds as much of the current line as will fit. Its -// only purpose is for printing it out to report an error to the user. -static const int max_error_width = 1024; -static char current_line[max_error_width + 1]; - -static int error_count = 0; -static int warning_count = 0; - -// This is the pointer to the current input stream. -static istream *inp = NULL; - -// This is the name of the egg file we're parsing. We keep it so we -// can print it out for error messages. -static string egg_filename; - -// This is the initial token state returned by the lexer. It allows -// the yacc grammar to start from initial points. -static int initial_token; - - -//////////////////////////////////////////////////////////////////// -// Defining the interface to the lexer. -//////////////////////////////////////////////////////////////////// - -void -egg_init_lexer(istream &in, const string &filename) { - inp = ∈ - egg_filename = filename; - line_number = 0; - col_number = 0; - error_count = 0; - warning_count = 0; - initial_token = START_EGG; -} - -void -egg_start_group_body() { - /* Set the initial state to begin within a group_body context, - instead of at the beginning of the egg file. */ - initial_token = START_GROUP_BODY; -} - -void -egg_start_texture_body() { - initial_token = START_TEXTURE_BODY; -} - -void -egg_start_primitive_body() { - initial_token = START_PRIMITIVE_BODY; -} - -int -egg_error_count() { - return error_count; -} - -int -egg_warning_count() { - return warning_count; -} - - -//////////////////////////////////////////////////////////////////// -// Internal support functions. -//////////////////////////////////////////////////////////////////// - -int -eggyywrap(void) { - return 1; -} - -void -eggyyerror(const string &msg) { - if (egg_cat.is_error()) { - ostream &out = egg_cat.error(false); - - out << "\nError"; - if (!egg_filename.empty()) { - out << " in " << egg_filename; - } - out - << " at line " << line_number << ", column " << col_number << ":\n" - << setiosflags(Notify::get_literal_flag()) - << current_line << "\n"; - indent(out, col_number-1) - << "^\n" << msg << "\n\n" - << resetiosflags(Notify::get_literal_flag()) << flush; - } - error_count++; -} - -void -eggyyerror(ostringstream &strm) { - string s = strm.str(); - eggyyerror(s); -} - -void -eggyywarning(const string &msg) { - if (egg_cat.is_warning()) { - ostream &out = egg_cat.warning(false); - - out << "\nWarning"; - if (!egg_filename.empty()) { - out << " in " << egg_filename; - } - out - << " at line " << line_number << ", column " << col_number << ":\n" - << setiosflags(Notify::get_literal_flag()) - << current_line << "\n"; - indent(out, col_number-1) - << "^\n" << msg << "\n\n" - << resetiosflags(Notify::get_literal_flag()) << flush; - } - warning_count++; -} - -void -eggyywarning(ostringstream &strm) { - string s = strm.str(); - eggyywarning(s); -} - -// Now define a function to take input from an istream instead of a -// stdio FILE pointer. This is flex-specific. -static void -input_chars(char *buffer, int &result, int max_size) { - nassertv(inp != NULL); - if (*inp) { - inp->read(buffer, max_size); - result = inp->gcount(); - - if (line_number == 0) { - // This is a special case. If we are reading the very first bit - // from the stream, copy it into the current_line array. This - // is because the \n.* rule below, which fills current_line - // normally, doesn't catch the first line. - int length = min(max_error_width, result); - strncpy(current_line, buffer, length); - current_line[length] = '\0'; - line_number++; - col_number = 0; - - // Truncate it at the newline. - char *end = strchr(current_line, '\n'); - if (end != NULL) { - *end = '\0'; - } - } - - } else { - // End of file or I/O error. - result = 0; - } -} -#undef YY_INPUT -#define YY_INPUT(buffer, result, max_size) input_chars(buffer, result, max_size) - -// read_char reads and returns a single character, incrementing the -// supplied line and column numbers as appropriate. A convenience -// function for the scanning functions below. -static int -read_char(int &line, int &col) { - int c = yyinput(); - if (c == '\n') { - line++; - col = 0; - } else { - col++; - } - return c; -} - -// scan_quoted_string reads a string delimited by quotation marks and -// returns it. -static string -scan_quoted_string() { - string result; - - // We don't touch the current line number and column number during - // scanning, so that if we detect an error while scanning the string - // (e.g. an unterminated string), we'll report the error as - // occurring at the start of the string, not at the end--somewhat - // more convenient for the user. - - // Instead of adjusting the global line_number and col_number - // variables, we'll operate on our own local variables for the - // interim. - int line = line_number; - int col = col_number; - - int c; - c = read_char(line, col); - while (c != '"' && c != EOF) { - result += c; - c = read_char(line, col); - } - - if (c == EOF) { - eggyyerror("This quotation mark is unterminated."); - } - - line_number = line; - col_number = col; - - return result; -} - -// eat_c_comment scans past all characters up until the first */ -// encountered. -static void -eat_c_comment() { - // As above, we'll operate on our own local copies of line_number - // and col_number within this function. - - int line = line_number; - int col = col_number; - - int c, last_c; - - last_c = '\0'; - c = read_char(line, col); - while (c != EOF && !(last_c == '*' && c == '/')) { - if (last_c == '/' && c == '*') { - ostringstream errmsg; - errmsg << "This comment contains a nested /* symbol at line " - << line << ", column " << col-1 << "--possibly unclosed?" - << ends; - eggyywarning(errmsg); - } - last_c = c; - c = read_char(line, col); - } - - if (c == EOF) { - eggyyerror("This comment marker is unclosed."); - } - - line_number = line; - col_number = col; -} - - -// accept() is called below as each piece is pulled off and -// accepted by the lexer; it increments the current column number. -INLINE void accept() { - col_number += yyleng; -} - -#line 1007 "lex.yy.c" - -/* Macros after this point can all be overridden by user definitions in - * section 1. - */ - -#ifndef YY_SKIP_YYWRAP -#ifdef __cplusplus -extern "C" int yywrap YY_PROTO(( void )); -#else -extern int yywrap YY_PROTO(( void )); -#endif -#endif - -#ifndef YY_NO_UNPUT -static void yyunput YY_PROTO(( int c, char *buf_ptr )); -#endif - -#ifndef yytext_ptr -static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int )); -#endif - -#ifdef YY_NEED_STRLEN -static int yy_flex_strlen YY_PROTO(( yyconst char * )); -#endif - -#ifndef YY_NO_INPUT -#ifdef __cplusplus -static int yyinput YY_PROTO(( void )); -#else -static int input YY_PROTO(( void )); -#endif -#endif - -#if YY_STACK_USED -static int yy_start_stack_ptr = 0; -static int yy_start_stack_depth = 0; -static int *yy_start_stack = 0; -#ifndef YY_NO_PUSH_STATE -static void yy_push_state YY_PROTO(( int new_state )); -#endif -#ifndef YY_NO_POP_STATE -static void yy_pop_state YY_PROTO(( void )); -#endif -#ifndef YY_NO_TOP_STATE -static int yy_top_state YY_PROTO(( void )); -#endif - -#else -#define YY_NO_PUSH_STATE 1 -#define YY_NO_POP_STATE 1 -#define YY_NO_TOP_STATE 1 -#endif - -#ifdef YY_MALLOC_DECL -YY_MALLOC_DECL -#else -#if __STDC__ -#ifndef __cplusplus -#include -#endif -#else -/* Just try to get by without declaring the routines. This will fail - * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int) - * or sizeof(void*) != sizeof(int). - */ -#endif -#endif - -/* Amount of stuff to slurp up with each read. */ -#ifndef YY_READ_BUF_SIZE -#define YY_READ_BUF_SIZE 8192 -#endif - -/* Copy whatever the last rule matched to the standard output. */ - -#ifndef ECHO -/* This used to be an fputs(), but since the string might contain NUL's, - * we now use fwrite(). - */ -#define ECHO (void) fwrite( yytext, yyleng, 1, yyout ) -#endif - -/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, - * is returned in "result". - */ -#ifndef YY_INPUT -#define YY_INPUT(buf,result,max_size) \ - if ( yy_current_buffer->yy_is_interactive ) \ - { \ - int c = '*', n; \ - for ( n = 0; n < max_size && \ - (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ - buf[n] = (char) c; \ - if ( c == '\n' ) \ - buf[n++] = (char) c; \ - if ( c == EOF && ferror( yyin ) ) \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - result = n; \ - } \ - else \ - { \ - errno=0; \ - while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \ - { \ - if( errno != EINTR) \ - { \ - YY_FATAL_ERROR( "input in flex scanner failed" ); \ - break; \ - } \ - errno=0; \ - clearerr(yyin); \ - } \ - } -#endif - -/* No semi-colon after return; correct usage is to write "yyterminate();" - - * we don't want an extra ';' after the "return" because that will cause - * some compilers to complain about unreachable statements. - */ -#ifndef yyterminate -#define yyterminate() return YY_NULL -#endif - -/* Number of entries by which start-condition stack grows. */ -#ifndef YY_START_STACK_INCR -#define YY_START_STACK_INCR 25 -#endif - -/* Report a fatal error. */ -#ifndef YY_FATAL_ERROR -#define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) -#endif - -/* Default declaration of generated scanner - a define so the user can - * easily add parameters. - */ -#ifndef YY_DECL -#define YY_DECL int yylex YY_PROTO(( void )) -#endif - -/* Code executed at the beginning of each rule, after yytext and yyleng - * have been set up. - */ -#ifndef YY_USER_ACTION -#define YY_USER_ACTION -#endif - -/* Code executed at the end of each rule. */ -#ifndef YY_BREAK -#define YY_BREAK break; -#endif - -#define YY_RULE_SETUP \ - YY_USER_ACTION - -YY_DECL - { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; - -#line 290 "lexer.lxx" - - - - if (initial_token != 0) { - int t = initial_token; - initial_token = 0; - return t; - } - - -#line 1180 "lex.yy.c" - - if ( yy_init ) - { - yy_init = 0; - -#ifdef YY_USER_INIT - YY_USER_INIT; -#endif - - if ( ! yy_start ) - yy_start = 1; /* first start state */ - - if ( ! yyin ) - yyin = stdin; - - if ( ! yyout ) - yyout = stdout; - - if ( ! yy_current_buffer ) - yy_current_buffer = - yy_create_buffer( yyin, YY_BUF_SIZE ); - - yy_load_buffer_state(); - } - - while ( 1 ) /* loops until end-of-file is reached */ - { - yy_cp = yy_c_buf_p; - - /* Support of yytext. */ - *yy_cp = yy_hold_char; - - /* yy_bp points to the position in yy_ch_buf of the start of - * the current run. - */ - yy_bp = yy_cp; - - yy_current_state = yy_start; -yy_match: - do - { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; - if ( yy_accept[yy_current_state] ) - { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 557 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - ++yy_cp; - } - while ( yy_base[yy_current_state] != 664 ); - -yy_find_action: - yy_act = yy_accept[yy_current_state]; - if ( yy_act == 0 ) - { /* have to back up */ - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; - yy_act = yy_accept[yy_current_state]; - } - - YY_DO_BEFORE_ACTION; - - -do_action: /* This label is used only to access EOF actions. */ - - - switch ( yy_act ) - { /* beginning of action switch */ - case 0: /* must back up */ - /* undo the effects of YY_DO_BEFORE_ACTION */ - *yy_cp = yy_hold_char; - yy_cp = yy_last_accepting_cpos; - yy_current_state = yy_last_accepting_state; - goto yy_find_action; - -case 1: -YY_RULE_SETUP -#line 300 "lexer.lxx" -{ - // New line. Save a copy of the line so we can print it out for the - // benefit of the user in case we get an error. - - strncpy(current_line, yytext+1, max_error_width); - current_line[max_error_width] = '\0'; - line_number++; - col_number=0; - - // Return the whole line to the lexer, except the newline character, - // which we eat. - yyless(1); -} - YY_BREAK -case 2: -YY_RULE_SETUP -#line 314 "lexer.lxx" -{ - // Eat whitespace. - accept(); -} - YY_BREAK -case 3: -YY_RULE_SETUP -#line 319 "lexer.lxx" -{ - // Eat C++-style comments. - accept(); -} - YY_BREAK -case 4: -YY_RULE_SETUP -#line 324 "lexer.lxx" -{ - // Eat C-style comments. - accept(); - eat_c_comment(); -} - YY_BREAK -case 5: -YY_RULE_SETUP -#line 330 "lexer.lxx" -{ - // Send curly braces as themselves. - accept(); - return eggyytext[0]; -} - YY_BREAK -case 6: -YY_RULE_SETUP -#line 338 "lexer.lxx" -{ - accept(); - return BEZIERCURVE; -} - YY_BREAK -case 7: -YY_RULE_SETUP -#line 342 "lexer.lxx" -{ - accept(); - return BFACE; -} - YY_BREAK -case 8: -YY_RULE_SETUP -#line 346 "lexer.lxx" -{ - accept(); - return BILLBOARD; -} - YY_BREAK -case 9: -YY_RULE_SETUP -#line 350 "lexer.lxx" -{ - accept(); - return BILLBOARDCENTER; -} - YY_BREAK -case 10: -YY_RULE_SETUP -#line 354 "lexer.lxx" -{ - accept(); - return BINORMAL; -} - YY_BREAK -case 11: -YY_RULE_SETUP -#line 358 "lexer.lxx" -{ - accept(); - return BUNDLE; -} - YY_BREAK -case 12: -YY_RULE_SETUP -#line 362 "lexer.lxx" -{ - accept(); - return SCALAR; -} - YY_BREAK -case 13: -YY_RULE_SETUP -#line 366 "lexer.lxx" -{ - accept(); - return CLOSED; -} - YY_BREAK -case 14: -YY_RULE_SETUP -#line 370 "lexer.lxx" -{ - accept(); - return COLLIDE; -} - YY_BREAK -case 15: -YY_RULE_SETUP -#line 374 "lexer.lxx" -{ - accept(); - return COMMENT; -} - YY_BREAK -case 16: -YY_RULE_SETUP -#line 378 "lexer.lxx" -{ - accept(); - return COMPONENT; -} - YY_BREAK -case 17: -YY_RULE_SETUP -#line 382 "lexer.lxx" -{ - accept(); - return COORDSYSTEM; -} - YY_BREAK -case 18: -YY_RULE_SETUP -#line 386 "lexer.lxx" -{ - accept(); - return CV; -} - YY_BREAK -case 19: -YY_RULE_SETUP -#line 390 "lexer.lxx" -{ - accept(); - return DART; -} - YY_BREAK -case 20: -YY_RULE_SETUP -#line 394 "lexer.lxx" -{ - accept(); - return DNORMAL; -} - YY_BREAK -case 21: -YY_RULE_SETUP -#line 398 "lexer.lxx" -{ - accept(); - return DRGBA; -} - YY_BREAK -case 22: -YY_RULE_SETUP -#line 402 "lexer.lxx" -{ - accept(); - return DUV; -} - YY_BREAK -case 23: -YY_RULE_SETUP -#line 406 "lexer.lxx" -{ - accept(); - return DXYZ; -} - YY_BREAK -case 24: -YY_RULE_SETUP -#line 410 "lexer.lxx" -{ - accept(); - return DCS; -} - YY_BREAK -case 25: -YY_RULE_SETUP -#line 414 "lexer.lxx" -{ - accept(); - return DISTANCE; -} - YY_BREAK -case 26: -YY_RULE_SETUP -#line 418 "lexer.lxx" -{ - accept(); - return DTREF; -} - YY_BREAK -case 27: -YY_RULE_SETUP -#line 422 "lexer.lxx" -{ - accept(); - return DYNAMICVERTEXPOOL; -} - YY_BREAK -case 28: -YY_RULE_SETUP -#line 426 "lexer.lxx" -{ - accept(); - return EXTERNAL_FILE; -} - YY_BREAK -case 29: -YY_RULE_SETUP -#line 430 "lexer.lxx" -{ - accept(); - return FLIGHT; -} - YY_BREAK -case 30: -YY_RULE_SETUP -#line 434 "lexer.lxx" -{ - accept(); - return GROUP; -} - YY_BREAK -case 31: -YY_RULE_SETUP -#line 438 "lexer.lxx" -{ - accept(); - return HIP; -} - YY_BREAK -case 32: -YY_RULE_SETUP -#line 442 "lexer.lxx" -{ - accept(); - return INTANGENT; -} - YY_BREAK -case 33: -YY_RULE_SETUP -#line 446 "lexer.lxx" -{ - accept(); - return JOINT; -} - YY_BREAK -case 34: -YY_RULE_SETUP -#line 450 "lexer.lxx" -{ - accept(); - return KNOTS; -} - YY_BREAK -case 35: -YY_RULE_SETUP -#line 454 "lexer.lxx" -{ - accept(); - return INCLUDE; -} - YY_BREAK -case 36: -YY_RULE_SETUP -#line 458 "lexer.lxx" -{ - accept(); - return INSTANCE; -} - YY_BREAK -case 37: -YY_RULE_SETUP -#line 462 "lexer.lxx" -{ - accept(); - return LINE; -} - YY_BREAK -case 38: -YY_RULE_SETUP -#line 466 "lexer.lxx" -{ - accept(); - return LOOP; -} - YY_BREAK -case 39: -YY_RULE_SETUP -#line 470 "lexer.lxx" -{ - accept(); - return MATERIAL; -} - YY_BREAK -case 40: -YY_RULE_SETUP -#line 474 "lexer.lxx" -{ - accept(); - return MATRIX3; -} - YY_BREAK -case 41: -YY_RULE_SETUP -#line 478 "lexer.lxx" -{ - accept(); - return MATRIX4; -} - YY_BREAK -case 42: -YY_RULE_SETUP -#line 482 "lexer.lxx" -{ - accept(); - return MODEL; -} - YY_BREAK -case 43: -YY_RULE_SETUP -#line 486 "lexer.lxx" -{ - accept(); - return MREF; -} - YY_BREAK -case 44: -YY_RULE_SETUP -#line 490 "lexer.lxx" -{ - accept(); - return NORMAL; -} - YY_BREAK -case 45: -YY_RULE_SETUP -#line 494 "lexer.lxx" -{ - accept(); - return NURBSCURVE; -} - YY_BREAK -case 46: -YY_RULE_SETUP -#line 498 "lexer.lxx" -{ - accept(); - return NURBSSURFACE; -} - YY_BREAK -case 47: -YY_RULE_SETUP -#line 502 "lexer.lxx" -{ - accept(); - return OBJECTTYPE; -} - YY_BREAK -case 48: -YY_RULE_SETUP -#line 506 "lexer.lxx" -{ - accept(); - return ORDER; -} - YY_BREAK -case 49: -YY_RULE_SETUP -#line 510 "lexer.lxx" -{ - accept(); - return OUTTANGENT; -} - YY_BREAK -case 50: -YY_RULE_SETUP -#line 514 "lexer.lxx" -{ - accept(); - return POINTLIGHT; -} - YY_BREAK -case 51: -YY_RULE_SETUP -#line 518 "lexer.lxx" -{ - accept(); - return POLYGON; -} - YY_BREAK -case 52: -YY_RULE_SETUP -#line 522 "lexer.lxx" -{ - accept(); - return REF; -} - YY_BREAK -case 53: -YY_RULE_SETUP -#line 526 "lexer.lxx" -{ - accept(); - return RGBA; -} - YY_BREAK -case 54: -YY_RULE_SETUP -#line 530 "lexer.lxx" -{ - accept(); - return ROTATE; -} - YY_BREAK -case 55: -YY_RULE_SETUP -#line 534 "lexer.lxx" -{ - accept(); - return ROTX; -} - YY_BREAK -case 56: -YY_RULE_SETUP -#line 538 "lexer.lxx" -{ - accept(); - return ROTY; -} - YY_BREAK -case 57: -YY_RULE_SETUP -#line 542 "lexer.lxx" -{ - accept(); - return ROTZ; -} - YY_BREAK -case 58: -YY_RULE_SETUP -#line 546 "lexer.lxx" -{ - accept(); - return SANIM; -} - YY_BREAK -case 59: -YY_RULE_SETUP -#line 550 "lexer.lxx" -{ - accept(); - return SCALAR; -} - YY_BREAK -case 60: -YY_RULE_SETUP -#line 554 "lexer.lxx" -{ - accept(); - return SCALE; -} - YY_BREAK -case 61: -YY_RULE_SETUP -#line 558 "lexer.lxx" -{ - accept(); - return SEQUENCE; -} - YY_BREAK -case 62: -YY_RULE_SETUP -#line 562 "lexer.lxx" -{ - accept(); - return SHADING; -} - YY_BREAK -case 63: -YY_RULE_SETUP -#line 566 "lexer.lxx" -{ - accept(); - return SWITCH; -} - YY_BREAK -case 64: -YY_RULE_SETUP -#line 570 "lexer.lxx" -{ - accept(); - return SWITCHCONDITION; -} - YY_BREAK -case 65: -YY_RULE_SETUP -#line 574 "lexer.lxx" -{ - accept(); - return TABLE; -} - YY_BREAK -case 66: -YY_RULE_SETUP -#line 578 "lexer.lxx" -{ - accept(); - return TABLE_V; -} - YY_BREAK -case 67: -YY_RULE_SETUP -#line 582 "lexer.lxx" -{ - accept(); - return TAG; -} - YY_BREAK -case 68: -YY_RULE_SETUP -#line 586 "lexer.lxx" -{ - accept(); - return TANGENT; -} - YY_BREAK -case 69: -YY_RULE_SETUP -#line 590 "lexer.lxx" -{ - accept(); - return TEXLIST; -} - YY_BREAK -case 70: -YY_RULE_SETUP -#line 594 "lexer.lxx" -{ - accept(); - return TEXTURE; -} - YY_BREAK -case 71: -YY_RULE_SETUP -#line 598 "lexer.lxx" -{ - accept(); - return TLENGTHS; -} - YY_BREAK -case 72: -YY_RULE_SETUP -#line 602 "lexer.lxx" -{ - accept(); - return TRANSFORM; -} - YY_BREAK -case 73: -YY_RULE_SETUP -#line 606 "lexer.lxx" -{ - accept(); - return TRANSLATE; -} - YY_BREAK -case 74: -YY_RULE_SETUP -#line 610 "lexer.lxx" -{ - accept(); - return TREF; -} - YY_BREAK -case 75: -YY_RULE_SETUP -#line 614 "lexer.lxx" -{ - accept(); - return TRIANGLEFAN; -} - YY_BREAK -case 76: -YY_RULE_SETUP -#line 618 "lexer.lxx" -{ - accept(); - return TRIANGLESTRIP; -} - YY_BREAK -case 77: -YY_RULE_SETUP -#line 622 "lexer.lxx" -{ - accept(); - return TRIM; -} - YY_BREAK -case 78: -YY_RULE_SETUP -#line 626 "lexer.lxx" -{ - accept(); - return TXT; -} - YY_BREAK -case 79: -YY_RULE_SETUP -#line 630 "lexer.lxx" -{ - accept(); - return UKNOTS; -} - YY_BREAK -case 80: -YY_RULE_SETUP -#line 634 "lexer.lxx" -{ - accept(); - return UKNOTS; -} - YY_BREAK -case 81: -YY_RULE_SETUP -#line 638 "lexer.lxx" -{ - accept(); - return UV; -} - YY_BREAK -case 82: -YY_RULE_SETUP -#line 642 "lexer.lxx" -{ - accept(); - return VKNOTS; -} - YY_BREAK -case 83: -YY_RULE_SETUP -#line 646 "lexer.lxx" -{ - accept(); - return VKNOTS; -} - YY_BREAK -case 84: -YY_RULE_SETUP -#line 650 "lexer.lxx" -{ - accept(); - return VERTEX; -} - YY_BREAK -case 85: -YY_RULE_SETUP -#line 654 "lexer.lxx" -{ - accept(); - return VERTEXANIM; -} - YY_BREAK -case 86: -YY_RULE_SETUP -#line 658 "lexer.lxx" -{ - accept(); - return VERTEXPOOL; -} - YY_BREAK -case 87: -YY_RULE_SETUP -#line 662 "lexer.lxx" -{ - accept(); - return VERTEXREF; -} - YY_BREAK -case 88: -YY_RULE_SETUP -#line 666 "lexer.lxx" -{ - accept(); - return XFMANIM; -} - YY_BREAK -case 89: -YY_RULE_SETUP -#line 670 "lexer.lxx" -{ - accept(); - return XFMSANIM; -} - YY_BREAK -case 90: -YY_RULE_SETUP -#line 677 "lexer.lxx" -{ - // An integer or floating-point number. - accept(); - eggyylval._number = atof(eggyytext); - eggyylval._string = yytext; - return NUMBER; -} - YY_BREAK -case 91: -YY_RULE_SETUP -#line 685 "lexer.lxx" -{ - // A hexadecimal integer number. - accept(); - eggyylval._ulong = strtoul(yytext+2, NULL, 16); - eggyylval._string = yytext; - return ULONG; -} - YY_BREAK -case 92: -YY_RULE_SETUP -#line 693 "lexer.lxx" -{ - // A binary integer number. - accept(); - eggyylval._ulong = strtoul(yytext+2, NULL, 2); - eggyylval._string = yytext; - return ULONG; -} - YY_BREAK -case 93: -YY_RULE_SETUP -#line 701 "lexer.lxx" -{ - // not-a-number. These sometimes show up in egg files accidentally. - accept(); - memset(&eggyylval._number, 0, sizeof(eggyylval._number)); - *(unsigned long *)&eggyylval._number = strtoul(yytext+3, NULL, 0); - eggyylval._string = yytext; - return NUMBER; -} - YY_BREAK -case 94: -YY_RULE_SETUP -#line 710 "lexer.lxx" -{ - // infinity. As above. - accept(); - eggyylval._number = HUGE_VAL; - eggyylval._string = yytext; - return NUMBER; -} - YY_BREAK -case 95: -YY_RULE_SETUP -#line 718 "lexer.lxx" -{ - // minus infinity. As above. - accept(); - eggyylval._number = -HUGE_VAL; - eggyylval._string = yytext; - return NUMBER; -} - YY_BREAK -case 96: -YY_RULE_SETUP -#line 727 "lexer.lxx" -{ - // Quoted string. - accept(); - eggyylval._string = scan_quoted_string(); - return STRING; -} - YY_BREAK -case 97: -YY_RULE_SETUP -#line 734 "lexer.lxx" -{ - // Unquoted string. - accept(); - eggyylval._string = yytext; - return STRING; -} - YY_BREAK -case 98: -YY_RULE_SETUP -#line 740 "lexer.lxx" -ECHO; - YY_BREAK -#line 2078 "lex.yy.c" -case YY_STATE_EOF(INITIAL): - yyterminate(); - - case YY_END_OF_BUFFER: - { - /* Amount of text matched not including the EOB char. */ - int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1; - - /* Undo the effects of YY_DO_BEFORE_ACTION. */ - *yy_cp = yy_hold_char; - YY_RESTORE_YY_MORE_OFFSET - - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW ) - { - /* We're scanning a new file or input source. It's - * possible that this happened because the user - * just pointed yyin at a new source and called - * yylex(). If so, then we have to assure - * consistency between yy_current_buffer and our - * globals. Here is the right place to do so, because - * this is the first action (other than possibly a - * back-up) that will match for the new input source. - */ - yy_n_chars = yy_current_buffer->yy_n_chars; - yy_current_buffer->yy_input_file = yyin; - yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL; - } - - /* Note that here we test for yy_c_buf_p "<=" to the position - * of the first EOB in the buffer, since yy_c_buf_p will - * already have been incremented past the NUL character - * (since all states make transitions on EOB to the - * end-of-buffer state). Contrast this with the test - * in input(). - */ - if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] ) - { /* This was really a NUL. */ - yy_state_type yy_next_state; - - yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state(); - - /* Okay, we're now positioned to make the NUL - * transition. We couldn't have - * yy_get_previous_state() go ahead and do it - * for us because it doesn't know how to deal - * with the possibility of jamming (and we don't - * want to build jamming into it because then it - * will run more slowly). - */ - - yy_next_state = yy_try_NUL_trans( yy_current_state ); - - yy_bp = yytext_ptr + YY_MORE_ADJ; - - if ( yy_next_state ) - { - /* Consume the NUL. */ - yy_cp = ++yy_c_buf_p; - yy_current_state = yy_next_state; - goto yy_match; - } - - else - { - yy_cp = yy_c_buf_p; - goto yy_find_action; - } - } - - else switch ( yy_get_next_buffer() ) - { - case EOB_ACT_END_OF_FILE: - { - yy_did_buffer_switch_on_eof = 0; - - if ( yywrap() ) - { - /* Note: because we've taken care in - * yy_get_next_buffer() to have set up - * yytext, we can now set up - * yy_c_buf_p so that if some total - * hoser (like flex itself) wants to - * call the scanner after we return the - * YY_NULL, it'll still work - another - * YY_NULL will get returned. - */ - yy_c_buf_p = yytext_ptr + YY_MORE_ADJ; - - yy_act = YY_STATE_EOF(YY_START); - goto do_action; - } - - else - { - if ( ! yy_did_buffer_switch_on_eof ) - YY_NEW_FILE; - } - break; - } - - case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = - yytext_ptr + yy_amount_of_matched_text; - - yy_current_state = yy_get_previous_state(); - - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; - goto yy_match; - - case EOB_ACT_LAST_MATCH: - yy_c_buf_p = - &yy_current_buffer->yy_ch_buf[yy_n_chars]; - - yy_current_state = yy_get_previous_state(); - - yy_cp = yy_c_buf_p; - yy_bp = yytext_ptr + YY_MORE_ADJ; - goto yy_find_action; - } - break; - } - - default: - YY_FATAL_ERROR( - "fatal flex scanner internal error--no action found" ); - } /* end of action switch */ - } /* end of scanning one token */ - } /* end of yylex */ - - -/* yy_get_next_buffer - try to read in a new buffer - * - * Returns a code representing an action: - * EOB_ACT_LAST_MATCH - - * EOB_ACT_CONTINUE_SCAN - continue scanning from current position - * EOB_ACT_END_OF_FILE - end of file - */ - -static int yy_get_next_buffer() - { - register char *dest = yy_current_buffer->yy_ch_buf; - register char *source = yytext_ptr; - register int number_to_move, i; - int ret_val; - - if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] ) - YY_FATAL_ERROR( - "fatal flex scanner internal error--end of buffer missed" ); - - if ( yy_current_buffer->yy_fill_buffer == 0 ) - { /* Don't try to fill the buffer, so this is an EOF. */ - if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 ) - { - /* We matched a single character, the EOB, so - * treat this as a final EOF. - */ - return EOB_ACT_END_OF_FILE; - } - - else - { - /* We matched some text prior to the EOB, first - * process it. - */ - return EOB_ACT_LAST_MATCH; - } - } - - /* Try to read more data. */ - - /* First move last chars to start of buffer. */ - number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1; - - for ( i = 0; i < number_to_move; ++i ) - *(dest++) = *(source++); - - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING ) - /* don't do the read, it's not guaranteed to return an EOF, - * just force an EOF - */ - yy_current_buffer->yy_n_chars = yy_n_chars = 0; - - else - { - int num_to_read = - yy_current_buffer->yy_buf_size - number_to_move - 1; - - while ( num_to_read <= 0 ) - { /* Not enough room in the buffer - grow it. */ -#ifdef YY_USES_REJECT - YY_FATAL_ERROR( -"input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); -#else - - /* just a shorter name for the current buffer */ - YY_BUFFER_STATE b = yy_current_buffer; - - int yy_c_buf_p_offset = - (int) (yy_c_buf_p - b->yy_ch_buf); - - if ( b->yy_is_our_buffer ) - { - int new_size = b->yy_buf_size * 2; - - if ( new_size <= 0 ) - b->yy_buf_size += b->yy_buf_size / 8; - else - b->yy_buf_size *= 2; - - b->yy_ch_buf = (char *) - /* Include room in for 2 EOB chars. */ - yy_flex_realloc( (void *) b->yy_ch_buf, - b->yy_buf_size + 2 ); - } - else - /* Can't grow it, we don't own it. */ - b->yy_ch_buf = 0; - - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( - "fatal error - scanner input buffer overflow" ); - - yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; - - num_to_read = yy_current_buffer->yy_buf_size - - number_to_move - 1; -#endif - } - - if ( num_to_read > YY_READ_BUF_SIZE ) - num_to_read = YY_READ_BUF_SIZE; - - /* Read in more data. */ - YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]), - yy_n_chars, num_to_read ); - - yy_current_buffer->yy_n_chars = yy_n_chars; - } - - if ( yy_n_chars == 0 ) - { - if ( number_to_move == YY_MORE_ADJ ) - { - ret_val = EOB_ACT_END_OF_FILE; - yyrestart( yyin ); - } - - else - { - ret_val = EOB_ACT_LAST_MATCH; - yy_current_buffer->yy_buffer_status = - YY_BUFFER_EOF_PENDING; - } - } - - else - ret_val = EOB_ACT_CONTINUE_SCAN; - - yy_n_chars += number_to_move; - yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR; - yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; - - yytext_ptr = &yy_current_buffer->yy_ch_buf[0]; - - return ret_val; - } - - -/* yy_get_previous_state - get the state just before the EOB char was reached */ - -static yy_state_type yy_get_previous_state() - { - register yy_state_type yy_current_state; - register char *yy_cp; - - yy_current_state = yy_start; - - for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) - { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); - if ( yy_accept[yy_current_state] ) - { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 557 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - } - - return yy_current_state; - } - - -/* yy_try_NUL_trans - try to make a transition on the NUL character - * - * synopsis - * next_state = yy_try_NUL_trans( current_state ); - */ - -#ifdef YY_USE_PROTOS -static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state ) -#else -static yy_state_type yy_try_NUL_trans( yy_current_state ) -yy_state_type yy_current_state; -#endif - { - register int yy_is_jam; - register char *yy_cp = yy_c_buf_p; - - register YY_CHAR yy_c = 1; - if ( yy_accept[yy_current_state] ) - { - yy_last_accepting_state = yy_current_state; - yy_last_accepting_cpos = yy_cp; - } - while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) - { - yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 557 ) - yy_c = yy_meta[(unsigned int) yy_c]; - } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 556); - - return yy_is_jam ? 0 : yy_current_state; - } - - -#ifndef YY_NO_UNPUT -#ifdef YY_USE_PROTOS -static void yyunput( int c, register char *yy_bp ) -#else -static void yyunput( c, yy_bp ) -int c; -register char *yy_bp; -#endif - { - register char *yy_cp = yy_c_buf_p; - - /* undo effects of setting up yytext */ - *yy_cp = yy_hold_char; - - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) - { /* need to shift things up to make room */ - /* +2 for EOB chars. */ - register int number_to_move = yy_n_chars + 2; - register char *dest = &yy_current_buffer->yy_ch_buf[ - yy_current_buffer->yy_buf_size + 2]; - register char *source = - &yy_current_buffer->yy_ch_buf[number_to_move]; - - while ( source > yy_current_buffer->yy_ch_buf ) - *--dest = *--source; - - yy_cp += (int) (dest - source); - yy_bp += (int) (dest - source); - yy_current_buffer->yy_n_chars = - yy_n_chars = yy_current_buffer->yy_buf_size; - - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) - YY_FATAL_ERROR( "flex scanner push-back overflow" ); - } - - *--yy_cp = (char) c; - - - yytext_ptr = yy_bp; - yy_hold_char = *yy_cp; - yy_c_buf_p = yy_cp; - } -#endif /* ifndef YY_NO_UNPUT */ - - -#ifdef __cplusplus -static int yyinput() -#else -static int input() -#endif - { - int c; - - *yy_c_buf_p = yy_hold_char; - - if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) - { - /* yy_c_buf_p now points to the character we want to return. - * If this occurs *before* the EOB characters, then it's a - * valid NUL; if not, then we've hit the end of the buffer. - */ - if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] ) - /* This was really a NUL. */ - *yy_c_buf_p = '\0'; - - else - { /* need more input */ - int offset = yy_c_buf_p - yytext_ptr; - ++yy_c_buf_p; - - switch ( yy_get_next_buffer() ) - { - case EOB_ACT_LAST_MATCH: - /* This happens because yy_g_n_b() - * sees that we've accumulated a - * token and flags that we need to - * try matching the token before - * proceeding. But for input(), - * there's no matching to consider. - * So convert the EOB_ACT_LAST_MATCH - * to EOB_ACT_END_OF_FILE. - */ - - /* Reset buffer status. */ - yyrestart( yyin ); - - /* fall through */ - - case EOB_ACT_END_OF_FILE: - { - if ( yywrap() ) - return EOF; - - if ( ! yy_did_buffer_switch_on_eof ) - YY_NEW_FILE; -#ifdef __cplusplus - return yyinput(); -#else - return input(); -#endif - } - - case EOB_ACT_CONTINUE_SCAN: - yy_c_buf_p = yytext_ptr + offset; - break; - } - } - } - - c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */ - *yy_c_buf_p = '\0'; /* preserve yytext */ - yy_hold_char = *++yy_c_buf_p; - - - return c; - } - - -#ifdef YY_USE_PROTOS -void yyrestart( FILE *input_file ) -#else -void yyrestart( input_file ) -FILE *input_file; -#endif - { - if ( ! yy_current_buffer ) - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); - - yy_init_buffer( yy_current_buffer, input_file ); - yy_load_buffer_state(); - } - - -#ifdef YY_USE_PROTOS -void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer ) -#else -void yy_switch_to_buffer( new_buffer ) -YY_BUFFER_STATE new_buffer; -#endif - { - if ( yy_current_buffer == new_buffer ) - return; - - if ( yy_current_buffer ) - { - /* Flush out information for old buffer. */ - *yy_c_buf_p = yy_hold_char; - yy_current_buffer->yy_buf_pos = yy_c_buf_p; - yy_current_buffer->yy_n_chars = yy_n_chars; - } - - yy_current_buffer = new_buffer; - yy_load_buffer_state(); - - /* We don't actually know whether we did this switch during - * EOF (yywrap()) processing, but the only time this flag - * is looked at is after yywrap() is called, so it's safe - * to go ahead and always set it. - */ - yy_did_buffer_switch_on_eof = 1; - } - - -#ifdef YY_USE_PROTOS -void yy_load_buffer_state( void ) -#else -void yy_load_buffer_state() -#endif - { - yy_n_chars = yy_current_buffer->yy_n_chars; - yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos; - yyin = yy_current_buffer->yy_input_file; - yy_hold_char = *yy_c_buf_p; - } - - -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_create_buffer( FILE *file, int size ) -#else -YY_BUFFER_STATE yy_create_buffer( file, size ) -FILE *file; -int size; -#endif - { - YY_BUFFER_STATE b; - - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_buf_size = size; - - /* yy_ch_buf has to be 2 characters longer than the size given because - * we need to put in 2 end-of-buffer characters. - */ - b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 ); - if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); - - b->yy_is_our_buffer = 1; - - yy_init_buffer( b, file ); - - return b; - } - - -#ifdef YY_USE_PROTOS -void yy_delete_buffer( YY_BUFFER_STATE b ) -#else -void yy_delete_buffer( b ) -YY_BUFFER_STATE b; -#endif - { - if ( ! b ) - return; - - if ( b == yy_current_buffer ) - yy_current_buffer = (YY_BUFFER_STATE) 0; - - if ( b->yy_is_our_buffer ) - yy_flex_free( (void *) b->yy_ch_buf ); - - yy_flex_free( (void *) b ); - } - - -#ifndef _WIN32 -#else -#ifndef YY_ALWAYS_INTERACTIVE -#ifndef YY_NEVER_INTERACTIVE -extern int isatty YY_PROTO(( int )); -#endif -#endif -#endif - -#ifdef YY_USE_PROTOS -void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) -#else -void yy_init_buffer( b, file ) -YY_BUFFER_STATE b; -FILE *file; -#endif - - - { - yy_flush_buffer( b ); - - b->yy_input_file = file; - b->yy_fill_buffer = 1; - -#if YY_ALWAYS_INTERACTIVE - b->yy_is_interactive = 1; -#else -#if YY_NEVER_INTERACTIVE - b->yy_is_interactive = 0; -#else - b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; -#endif -#endif - } - - -#ifdef YY_USE_PROTOS -void yy_flush_buffer( YY_BUFFER_STATE b ) -#else -void yy_flush_buffer( b ) -YY_BUFFER_STATE b; -#endif - - { - if ( ! b ) - return; - - b->yy_n_chars = 0; - - /* We always need two end-of-buffer characters. The first causes - * a transition to the end-of-buffer state. The second causes - * a jam in that state. - */ - b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; - b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; - - b->yy_buf_pos = &b->yy_ch_buf[0]; - - b->yy_at_bol = 1; - b->yy_buffer_status = YY_BUFFER_NEW; - - if ( b == yy_current_buffer ) - yy_load_buffer_state(); - } - - -#ifndef YY_NO_SCAN_BUFFER -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size ) -#else -YY_BUFFER_STATE yy_scan_buffer( base, size ) -char *base; -yy_size_t size; -#endif - { - YY_BUFFER_STATE b; - - if ( size < 2 || - base[size-2] != YY_END_OF_BUFFER_CHAR || - base[size-1] != YY_END_OF_BUFFER_CHAR ) - /* They forgot to leave room for the EOB's. */ - return 0; - - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); - if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ - b->yy_buf_pos = b->yy_ch_buf = base; - b->yy_is_our_buffer = 0; - b->yy_input_file = 0; - b->yy_n_chars = b->yy_buf_size; - b->yy_is_interactive = 0; - b->yy_at_bol = 1; - b->yy_fill_buffer = 0; - b->yy_buffer_status = YY_BUFFER_NEW; - - yy_switch_to_buffer( b ); - - return b; - } -#endif - - -#ifndef YY_NO_SCAN_STRING -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str ) -#else -YY_BUFFER_STATE yy_scan_string( yy_str ) -yyconst char *yy_str; -#endif - { - int len; - for ( len = 0; yy_str[len]; ++len ) - ; - - return yy_scan_bytes( yy_str, len ); - } -#endif - - -#ifndef YY_NO_SCAN_BYTES -#ifdef YY_USE_PROTOS -YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len ) -#else -YY_BUFFER_STATE yy_scan_bytes( bytes, len ) -yyconst char *bytes; -int len; -#endif - { - YY_BUFFER_STATE b; - char *buf; - yy_size_t n; - int i; - - /* Get memory for full buffer, including space for trailing EOB's. */ - n = len + 2; - buf = (char *) yy_flex_alloc( n ); - if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); - - for ( i = 0; i < len; ++i ) - buf[i] = bytes[i]; - - buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; - - b = yy_scan_buffer( buf, n ); - if ( ! b ) - YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); - - /* It's okay to grow etc. this buffer, and we should throw it - * away when we're done. - */ - b->yy_is_our_buffer = 1; - - return b; - } -#endif - - -#ifndef YY_NO_PUSH_STATE -#ifdef YY_USE_PROTOS -static void yy_push_state( int new_state ) -#else -static void yy_push_state( new_state ) -int new_state; -#endif - { - if ( yy_start_stack_ptr >= yy_start_stack_depth ) - { - yy_size_t new_size; - - yy_start_stack_depth += YY_START_STACK_INCR; - new_size = yy_start_stack_depth * sizeof( int ); - - if ( ! yy_start_stack ) - yy_start_stack = (int *) yy_flex_alloc( new_size ); - - else - yy_start_stack = (int *) yy_flex_realloc( - (void *) yy_start_stack, new_size ); - - if ( ! yy_start_stack ) - YY_FATAL_ERROR( - "out of memory expanding start-condition stack" ); - } - - yy_start_stack[yy_start_stack_ptr++] = YY_START; - - BEGIN(new_state); - } -#endif - - -#ifndef YY_NO_POP_STATE -static void yy_pop_state() - { - if ( --yy_start_stack_ptr < 0 ) - YY_FATAL_ERROR( "start-condition stack underflow" ); - - BEGIN(yy_start_stack[yy_start_stack_ptr]); - } -#endif - - -#ifndef YY_NO_TOP_STATE -static int yy_top_state() - { - return yy_start_stack[yy_start_stack_ptr - 1]; - } -#endif - -#ifndef YY_EXIT_FAILURE -#define YY_EXIT_FAILURE 2 -#endif - -#ifdef YY_USE_PROTOS -static void yy_fatal_error( yyconst char msg[] ) -#else -static void yy_fatal_error( msg ) -char msg[]; -#endif - { - (void) fprintf( stderr, "%s\n", msg ); - exit( YY_EXIT_FAILURE ); - } - - - -/* Redefine yyless() so it works in section 3 code. */ - -#undef yyless -#define yyless(n) \ - do \ - { \ - /* Undo effects of setting up yytext. */ \ - yytext[yyleng] = yy_hold_char; \ - yy_c_buf_p = yytext + n; \ - yy_hold_char = *yy_c_buf_p; \ - *yy_c_buf_p = '\0'; \ - yyleng = n; \ - } \ - while ( 0 ) - - -/* Internal utility routines. */ - -#ifndef yytext_ptr -#ifdef YY_USE_PROTOS -static void yy_flex_strncpy( char *s1, yyconst char *s2, int n ) -#else -static void yy_flex_strncpy( s1, s2, n ) -char *s1; -yyconst char *s2; -int n; -#endif - { - register int i; - for ( i = 0; i < n; ++i ) - s1[i] = s2[i]; - } -#endif - -#ifdef YY_NEED_STRLEN -#ifdef YY_USE_PROTOS -static int yy_flex_strlen( yyconst char *s ) -#else -static int yy_flex_strlen( s ) -yyconst char *s; -#endif - { - register int n; - for ( n = 0; s[n]; ++n ) - ; - - return n; - } -#endif - - -#ifdef YY_USE_PROTOS -static void *yy_flex_alloc( yy_size_t size ) -#else -static void *yy_flex_alloc( size ) -yy_size_t size; -#endif - { - return (void *) malloc( size ); - } - -#ifdef YY_USE_PROTOS -static void *yy_flex_realloc( void *ptr, yy_size_t size ) -#else -static void *yy_flex_realloc( ptr, size ) -void *ptr; -yy_size_t size; -#endif - { - /* The cast to (char *) in the following accommodates both - * implementations that use char* generic pointers, and those - * that use void* generic pointers. It works with the latter - * because both ANSI C and C++ allow castless assignment from - * any pointer type to void*, and deal with argument conversions - * as though doing an assignment. - */ - return (void *) realloc( (char *) ptr, size ); - } - -#ifdef YY_USE_PROTOS -static void yy_flex_free( void *ptr ) -#else -static void yy_flex_free( ptr ) -void *ptr; -#endif - { - free( ptr ); - } - -#if YY_MAIN -int main() - { - yylex(); - return 0; - } -#endif -#line 740 "lexer.lxx" +#define yy_create_buffer eggyy_create_buffer +#define yy_delete_buffer eggyy_delete_buffer +#define yy_scan_buffer eggyy_scan_buffer +#define yy_scan_string eggyy_scan_string +#define yy_scan_bytes eggyy_scan_bytes +#define yy_flex_debug eggyy_flex_debug +#define yy_init_buffer eggyy_init_buffer +#define yy_flush_buffer eggyy_flush_buffer +#define yy_load_buffer_state eggyy_load_buffer_state +#define yy_switch_to_buffer eggyy_switch_to_buffer +#define yyin eggyyin +#define yyleng eggyyleng +#define yylex eggyylex +#define yyout eggyyout +#define yyrestart eggyyrestart +#define yytext eggyytext +#define yywrap eggyywrap + +#line 20 "lex.yy.c" +/* A lexical scanner generated by flex */ + +/* Scanner skeleton version: + * $Header$ + */ + +#define FLEX_SCANNER +#define YY_FLEX_MAJOR_VERSION 2 +#define YY_FLEX_MINOR_VERSION 5 + +#include + + +/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ +#ifdef c_plusplus +#ifndef __cplusplus +#define __cplusplus +#endif +#endif + + +#ifdef __cplusplus + +#include + +/* Use prototypes in function declarations. */ +#define YY_USE_PROTOS + +/* The "const" storage-class-modifier is valid. */ +#define YY_USE_CONST + +#else /* ! __cplusplus */ + +#if __STDC__ + +#define YY_USE_PROTOS +#define YY_USE_CONST + +#endif /* __STDC__ */ +#endif /* ! __cplusplus */ + +#ifdef __TURBOC__ + #pragma warn -rch + #pragma warn -use +#include +#include +#define YY_USE_CONST +#define YY_USE_PROTOS +#endif + +#ifdef YY_USE_CONST +#define yyconst const +#else +#define yyconst +#endif + + +#ifdef YY_USE_PROTOS +#define YY_PROTO(proto) proto +#else +#define YY_PROTO(proto) () +#endif + +/* Returned upon end-of-file. */ +#define YY_NULL 0 + +/* Promotes a possibly negative, possibly signed char to an unsigned + * integer for use as an array index. If the signed char is negative, + * we want to instead treat it as an 8-bit unsigned char, hence the + * double cast. + */ +#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) + +/* Enter a start condition. This macro really ought to take a parameter, + * but we do it the disgusting crufty way forced on us by the ()-less + * definition of BEGIN. + */ +#define BEGIN yy_start = 1 + 2 * + +/* Translate the current start state into a value that can be later handed + * to BEGIN to return to the state. The YYSTATE alias is for lex + * compatibility. + */ +#define YY_START ((yy_start - 1) / 2) +#define YYSTATE YY_START + +/* Action number for EOF rule of a given start state. */ +#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) + +/* Special action meaning "start processing a new file". */ +#define YY_NEW_FILE yyrestart( yyin ) + +#define YY_END_OF_BUFFER_CHAR 0 + +/* Size of default input buffer. */ +#define YY_BUF_SIZE 16384 + +typedef struct yy_buffer_state *YY_BUFFER_STATE; + +extern int yyleng; +extern FILE *yyin, *yyout; + +#define EOB_ACT_CONTINUE_SCAN 0 +#define EOB_ACT_END_OF_FILE 1 +#define EOB_ACT_LAST_MATCH 2 + +/* The funky do-while in the following #define is used to turn the definition + * int a single C statement (which needs a semi-colon terminator). This + * avoids problems with code like: + * + * if ( condition_holds ) + * yyless( 5 ); + * else + * do_something_else(); + * + * Prior to using the do-while the compiler would get upset at the + * "else" because it interpreted the "if" statement as being all + * done when it reached the ';' after the yyless() call. + */ + +/* Return all but the first 'n' matched characters back to the input stream. */ + +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ + *yy_cp = yy_hold_char; \ + YY_RESTORE_YY_MORE_OFFSET \ + yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \ + YY_DO_BEFORE_ACTION; /* set up yytext again */ \ + } \ + while ( 0 ) + +#define unput(c) yyunput( c, yytext_ptr ) + +/* The following is because we cannot portably get our hands on size_t + * (without autoconf's help, which isn't available because we want + * flex-generated scanners to compile on their own). + */ +typedef unsigned int yy_size_t; + + +struct yy_buffer_state + { + FILE *yy_input_file; + + char *yy_ch_buf; /* input buffer */ + char *yy_buf_pos; /* current position in input buffer */ + + /* Size of input buffer in bytes, not including room for EOB + * characters. + */ + yy_size_t yy_buf_size; + + /* Number of characters read into yy_ch_buf, not including EOB + * characters. + */ + int yy_n_chars; + + /* Whether we "own" the buffer - i.e., we know we created it, + * and can realloc() it to grow it, and should free() it to + * delete it. + */ + int yy_is_our_buffer; + + /* Whether this is an "interactive" input source; if so, and + * if we're using stdio for input, then we want to use getc() + * instead of fread(), to make sure we stop fetching input after + * each newline. + */ + int yy_is_interactive; + + /* Whether we're considered to be at the beginning of a line. + * If so, '^' rules will be active on the next match, otherwise + * not. + */ + int yy_at_bol; + + /* Whether to try to fill the input buffer when we reach the + * end of it. + */ + int yy_fill_buffer; + + int yy_buffer_status; +#define YY_BUFFER_NEW 0 +#define YY_BUFFER_NORMAL 1 + /* When an EOF's been seen but there's still some text to process + * then we mark the buffer as YY_EOF_PENDING, to indicate that we + * shouldn't try reading from the input source any more. We might + * still have a bunch of tokens to match, though, because of + * possible backing-up. + * + * When we actually see the EOF, we change the status to "new" + * (via yyrestart()), so that the user can continue scanning by + * just pointing yyin at a new input file. + */ +#define YY_BUFFER_EOF_PENDING 2 + }; + +static YY_BUFFER_STATE yy_current_buffer = 0; + +/* We provide macros for accessing buffer states in case in the + * future we want to put the buffer states in a more general + * "scanner state". + */ +#define YY_CURRENT_BUFFER yy_current_buffer + + +/* yy_hold_char holds the character lost when yytext is formed. */ +static char yy_hold_char; + +static int yy_n_chars; /* number of characters read into yy_ch_buf */ + + +int yyleng; + +/* Points to current character in buffer. */ +static char *yy_c_buf_p = (char *) 0; +static int yy_init = 1; /* whether we need to initialize */ +static int yy_start = 0; /* start state number */ + +/* Flag which is used to allow yywrap()'s to do buffer switches + * instead of setting up a fresh yyin. A bit of a hack ... + */ +static int yy_did_buffer_switch_on_eof; + +void yyrestart YY_PROTO(( FILE *input_file )); + +void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer )); +void yy_load_buffer_state YY_PROTO(( void )); +YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size )); +void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b )); +void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file )); +void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b )); +#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer ) + +YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size )); +YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str )); +YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len )); + +static void *yy_flex_alloc YY_PROTO(( yy_size_t )); +static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )); +static void yy_flex_free YY_PROTO(( void * )); + +#define yy_new_buffer yy_create_buffer + +#define yy_set_interactive(is_interactive) \ + { \ + if ( ! yy_current_buffer ) \ + yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ + yy_current_buffer->yy_is_interactive = is_interactive; \ + } + +#define yy_set_bol(at_bol) \ + { \ + if ( ! yy_current_buffer ) \ + yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \ + yy_current_buffer->yy_at_bol = at_bol; \ + } + +#define YY_AT_BOL() (yy_current_buffer->yy_at_bol) + +typedef unsigned char YY_CHAR; +FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0; +typedef int yy_state_type; +extern char *yytext; +#define yytext_ptr yytext + +static yy_state_type yy_get_previous_state YY_PROTO(( void )); +static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state )); +static int yy_get_next_buffer YY_PROTO(( void )); +static void yy_fatal_error YY_PROTO(( yyconst char msg[] )); + +/* Done after the current pattern has been matched and before the + * corresponding action - sets up yytext. + */ +#define YY_DO_BEFORE_ACTION \ + yytext_ptr = yy_bp; \ + yyleng = (int) (yy_cp - yy_bp); \ + yy_hold_char = *yy_cp; \ + *yy_cp = '\0'; \ + yy_c_buf_p = yy_cp; + +#define YY_NUM_RULES 98 +#define YY_END_OF_BUFFER 99 +static yyconst short int yy_accept[557] = + { 0, + 0, 0, 99, 97, 2, 1, 96, 97, 97, 97, + 97, 90, 90, 97, 97, 97, 5, 97, 1, 97, + 90, 97, 90, 4, 3, 90, 92, 97, 91, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 3, 3, 92, 97, 90, 91, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 66, 97, 97, 97, 94, 97, 95, 97, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 18, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 32, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 81, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 97, 97, 97, 24, 97, 97, 97, 97, + + 22, 97, 97, 97, 97, 97, 31, 97, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 97, 97, 52, 97, 97, 97, 97, 97, + 97, 97, 97, 97, 97, 97, 67, 97, 97, 97, + 97, 97, 97, 97, 97, 78, 97, 97, 97, 97, + 97, 97, 93, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 97, 97, 19, 97, 97, 97, 97, 23, + 97, 28, 97, 97, 97, 97, 97, 97, 37, 38, + 97, 97, 97, 43, 97, 97, 97, 97, 97, 97, + 97, 53, 97, 55, 56, 57, 97, 97, 97, 97, + + 97, 97, 97, 97, 97, 97, 97, 97, 74, 97, + 77, 97, 97, 97, 97, 97, 97, 93, 97, 7, + 97, 97, 97, 12, 97, 97, 97, 97, 97, 97, + 97, 21, 26, 97, 97, 30, 97, 97, 33, 34, + 97, 97, 42, 97, 97, 97, 97, 48, 97, 97, + 97, 97, 97, 97, 60, 97, 97, 97, 65, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 97, 97, 97, 11, 13, 97, 97, 97, + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, + 44, 97, 97, 97, 97, 97, 97, 54, 58, 59, + + 97, 97, 63, 97, 97, 97, 97, 97, 97, 97, + 97, 97, 97, 97, 97, 84, 97, 97, 97, 97, + 97, 97, 97, 14, 15, 97, 97, 97, 20, 97, + 97, 35, 97, 97, 40, 41, 97, 97, 97, 97, + 97, 51, 97, 62, 97, 68, 69, 70, 97, 97, + 97, 97, 79, 80, 82, 83, 97, 97, 97, 97, + 97, 97, 10, 97, 97, 25, 97, 97, 36, 39, + 97, 97, 97, 97, 97, 61, 97, 71, 97, 97, + 97, 97, 97, 97, 97, 88, 97, 97, 8, 97, + 16, 97, 97, 97, 97, 97, 97, 97, 97, 97, + + 72, 73, 97, 97, 97, 97, 87, 97, 97, 97, + 97, 97, 29, 45, 97, 47, 49, 50, 97, 97, + 97, 85, 86, 97, 6, 97, 97, 97, 97, 97, + 75, 97, 89, 97, 97, 97, 46, 97, 97, 97, + 97, 97, 97, 76, 97, 97, 97, 97, 9, 97, + 97, 64, 17, 97, 27, 0 + } ; + +static yyconst int yy_ec[256] = + { 0, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, + 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 2, 1, 4, 1, 5, 1, 1, 1, 1, + 1, 6, 7, 1, 8, 9, 10, 11, 12, 13, + 14, 15, 13, 13, 13, 13, 13, 1, 1, 16, + 1, 17, 1, 1, 19, 20, 21, 22, 23, 24, + 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, + 1, 1, 1, 1, 18, 1, 19, 20, 21, 22, + + 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, + 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, + 43, 44, 45, 1, 45, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1 + } ; + +static yyconst int yy_meta[46] = + { 0, + 1, 2, 3, 2, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 2 + } ; + +static yyconst short int yy_base[562] = + { 0, + 0, 44, 663, 0, 664, 0, 664, 8, 81, 22, + 18, 100, 19, 123, 630, 642, 664, 0, 0, 29, + 30, 628, 51, 0, 65, 68, 14, 159, 164, 61, + 91, 170, 43, 623, 631, 625, 623, 623, 70, 68, + 66, 86, 621, 93, 175, 181, 128, 111, 629, 628, + 619, 626, 136, 0, 18, 207, 213, 0, 605, 629, + 45, 615, 627, 612, 102, 627, 607, 605, 604, 607, + 614, 602, 597, 593, 603, 604, 595, 599, 597, 173, + 603, 596, 596, 594, 588, 603, 601, 587, 586, 593, + 598, 581, 100, 594, 597, 578, 596, 595, 578, 593, + + 584, 209, 568, 586, 176, 570, 578, 577, 588, 575, + 0, 574, 566, 570, 0, 589, 0, 572, 577, 567, + 563, 573, 558, 556, 562, 199, 555, 0, 552, 572, + 550, 551, 566, 562, 567, 539, 563, 558, 562, 540, + 561, 0, 547, 538, 543, 536, 550, 538, 146, 548, + 546, 538, 548, 544, 543, 527, 532, 520, 545, 542, + 195, 528, 529, 519, 535, 518, 525, 537, 528, 48, + 520, 519, 526, 174, 532, 516, 515, 0, 514, 513, + 506, 538, 500, 518, 517, 519, 502, 507, 530, 512, + 507, 510, 499, 509, 513, 0, 510, 497, 508, 502, + + 0, 508, 493, 506, 496, 487, 0, 481, 500, 480, + 480, 499, 498, 478, 486, 482, 494, 491, 472, 487, + 471, 487, 467, 479, 0, 486, 464, 484, 483, 482, + 471, 79, 474, 469, 474, 471, 0, 470, 465, 452, + 465, 452, 471, 455, 469, 0, 452, 451, 450, 449, + 458, 461, 231, 443, 461, 444, 445, 452, 457, 451, + 450, 439, 438, 442, 0, 436, 448, 449, 448, 0, + 437, 0, 440, 445, 439, 428, 442, 441, 0, 0, + 430, 414, 438, 0, 424, 194, 415, 435, 419, 420, + 416, 0, 425, 0, 0, 0, 416, 410, 428, 412, + + 411, 416, 424, 408, 402, 402, 399, 134, 0, 411, + 0, 397, 396, 395, 394, 389, 398, 0, 408, 0, + 409, 408, 409, 0, 408, 401, 385, 399, 389, 399, + 389, 0, 0, 397, 398, 0, 393, 394, 0, 0, + 395, 221, 0, 396, 373, 372, 372, 0, 384, 381, + 375, 389, 388, 387, 0, 382, 377, 120, 0, 363, + 362, 376, 372, 364, 377, 365, 357, 356, 355, 354, + 230, 363, 350, 352, 357, 0, 0, 369, 368, 352, + 364, 359, 364, 340, 357, 361, 354, 346, 358, 357, + 0, 337, 336, 328, 347, 344, 351, 0, 0, 0, + + 344, 349, 0, 332, 347, 346, 345, 324, 324, 321, + 335, 340, 339, 338, 337, 0, 321, 319, 328, 319, + 313, 326, 330, 0, 0, 308, 307, 327, 0, 320, + 319, 0, 324, 323, 0, 0, 299, 314, 303, 304, + 309, 0, 317, 0, 301, 0, 0, 0, 315, 300, + 307, 224, 0, 0, 0, 0, 302, 295, 303, 239, + 286, 241, 0, 308, 301, 0, 287, 286, 0, 0, + 298, 301, 296, 280, 279, 0, 294, 0, 298, 297, + 294, 274, 280, 280, 292, 0, 271, 284, 0, 283, + 0, 268, 266, 286, 285, 280, 283, 282, 281, 270, + + 0, 0, 264, 259, 277, 276, 0, 287, 274, 258, + 246, 265, 0, 0, 264, 0, 0, 0, 248, 268, + 257, 0, 0, 266, 0, 244, 244, 238, 262, 251, + 0, 243, 0, 253, 227, 229, 0, 227, 242, 204, + 209, 174, 160, 0, 122, 76, 35, 32, 0, 21, + 1, 0, 0, 1, 0, 664, 266, 0, 269, 271, + 273 + } ; + +static yyconst short int yy_def[562] = + { 0, + 557, 557, 556, 558, 556, 559, 556, 558, 558, 558, + 558, 558, 12, 558, 558, 558, 556, 558, 559, 558, + 12, 558, 558, 558, 560, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 560, 561, 558, 558, 558, 29, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 253, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 558, 558, 558, 558, 558, + 558, 558, 558, 558, 558, 0, 556, 556, 556, 556, + 556 + } ; + +static yyconst short int yy_nxt[710] = + { 0, + 18, 5, 6, 7, 556, 556, 8, 9, 10, 11, + 12, 13, 13, 13, 13, 14, 20, 555, 21, 21, + 21, 21, 21, 24, 55, 55, 15, 25, 55, 55, + 554, 16, 23, 23, 23, 23, 23, 553, 18, 23, + 23, 23, 23, 23, 17, 5, 6, 7, 552, 18, + 8, 9, 10, 11, 12, 13, 13, 13, 13, 14, + 18, 23, 23, 23, 23, 23, 54, 551, 54, 76, + 15, 18, 77, 28, 120, 16, 121, 239, 23, 23, + 23, 23, 23, 59, 60, 240, 85, 61, 17, 20, + 28, 21, 21, 21, 21, 21, 83, 298, 88, 62, + + 86, 299, 84, 87, 89, 90, 550, 22, 26, 54, + 21, 21, 21, 21, 21, 94, 63, 95, 110, 27, + 64, 91, 28, 65, 92, 96, 157, 111, 112, 158, + 66, 125, 126, 113, 127, 107, 403, 54, 549, 54, + 404, 29, 30, 31, 32, 108, 33, 34, 35, 36, + 37, 38, 39, 40, 41, 42, 43, 364, 44, 45, + 46, 47, 48, 365, 49, 56, 56, 109, 214, 57, + 57, 57, 57, 57, 58, 58, 58, 58, 58, 97, + 54, 215, 58, 58, 58, 58, 58, 58, 67, 142, + 68, 548, 244, 143, 172, 98, 69, 99, 173, 102, + + 100, 70, 174, 103, 245, 71, 547, 72, 73, 144, + 104, 74, 75, 227, 345, 101, 105, 57, 57, 57, + 57, 57, 106, 57, 57, 57, 57, 57, 167, 192, + 346, 546, 193, 168, 389, 390, 228, 229, 230, 545, + 169, 318, 318, 318, 318, 318, 416, 481, 417, 318, + 318, 318, 318, 318, 318, 486, 487, 489, 544, 543, + 482, 490, 542, 418, 541, 419, 4, 4, 4, 19, + 19, 53, 53, 54, 54, 540, 539, 538, 537, 536, + 535, 534, 533, 532, 531, 530, 529, 528, 527, 526, + 525, 524, 523, 522, 521, 520, 519, 518, 517, 516, + + 515, 514, 513, 512, 511, 510, 509, 508, 507, 506, + 505, 504, 503, 502, 501, 500, 499, 498, 497, 496, + 495, 494, 493, 492, 491, 488, 485, 484, 483, 480, + 479, 478, 477, 476, 475, 474, 473, 472, 471, 470, + 469, 468, 467, 466, 465, 464, 463, 462, 461, 460, + 459, 458, 457, 456, 455, 454, 453, 452, 451, 450, + 449, 448, 447, 446, 445, 444, 443, 442, 441, 440, + 439, 438, 437, 436, 435, 434, 433, 432, 431, 430, + 429, 428, 427, 426, 425, 424, 423, 422, 421, 420, + 415, 414, 413, 412, 411, 410, 409, 408, 407, 406, + + 405, 402, 401, 400, 399, 398, 397, 396, 395, 394, + 393, 392, 391, 388, 387, 386, 385, 384, 383, 382, + 381, 380, 379, 378, 377, 376, 375, 374, 373, 372, + 371, 370, 369, 368, 367, 366, 363, 362, 361, 360, + 359, 358, 357, 356, 355, 354, 353, 352, 351, 350, + 349, 348, 347, 344, 343, 342, 341, 340, 339, 338, + 337, 336, 335, 334, 333, 332, 331, 330, 329, 328, + 327, 326, 325, 324, 323, 322, 321, 320, 319, 317, + 316, 315, 314, 313, 312, 311, 310, 309, 308, 307, + 306, 305, 304, 303, 302, 301, 300, 297, 296, 295, + + 294, 293, 292, 291, 290, 289, 288, 287, 286, 285, + 284, 283, 282, 281, 280, 279, 278, 277, 276, 275, + 274, 273, 272, 271, 270, 269, 268, 267, 266, 265, + 264, 263, 262, 261, 260, 259, 258, 257, 256, 255, + 254, 253, 252, 251, 250, 249, 248, 247, 246, 243, + 242, 241, 238, 237, 236, 235, 234, 233, 232, 231, + 226, 225, 224, 223, 222, 221, 220, 219, 218, 217, + 216, 213, 212, 211, 210, 209, 208, 207, 206, 205, + 204, 203, 202, 201, 200, 199, 198, 197, 196, 195, + 194, 191, 190, 189, 188, 187, 186, 185, 184, 183, + + 182, 181, 180, 179, 178, 177, 176, 175, 171, 170, + 166, 165, 164, 163, 162, 161, 160, 159, 156, 155, + 154, 153, 152, 151, 150, 149, 148, 147, 146, 145, + 141, 140, 139, 138, 137, 136, 135, 134, 133, 132, + 131, 130, 129, 128, 124, 123, 122, 119, 118, 117, + 116, 115, 114, 93, 82, 81, 80, 79, 78, 52, + 51, 50, 556, 3, 556, 556, 556, 556, 556, 556, + 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, + 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, + 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, + + 556, 556, 556, 556, 556, 556, 556, 556, 556 + } ; + +static yyconst short int yy_chk[710] = + { 0, + 558, 1, 1, 1, 0, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 8, 554, 8, 8, + 8, 8, 8, 11, 27, 27, 1, 11, 55, 55, + 551, 1, 10, 10, 10, 10, 10, 550, 13, 20, + 20, 20, 20, 20, 1, 2, 2, 2, 548, 21, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 13, 23, 23, 23, 23, 23, 25, 547, 25, 33, + 2, 21, 33, 23, 61, 2, 61, 170, 26, 26, + 26, 26, 26, 30, 30, 170, 40, 30, 2, 9, + 26, 9, 9, 9, 9, 9, 39, 232, 41, 30, + + 40, 232, 39, 40, 41, 42, 546, 9, 12, 25, + 12, 12, 12, 12, 12, 44, 31, 44, 48, 12, + 31, 42, 12, 31, 42, 44, 93, 48, 48, 93, + 31, 65, 65, 48, 65, 47, 358, 53, 545, 53, + 358, 12, 14, 14, 14, 47, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14, 308, 14, 14, + 14, 14, 14, 308, 14, 28, 28, 47, 149, 28, + 28, 28, 28, 28, 29, 29, 29, 29, 29, 45, + 53, 149, 29, 29, 29, 29, 29, 29, 32, 80, + 32, 543, 174, 80, 105, 45, 32, 45, 105, 46, + + 45, 32, 105, 46, 174, 32, 542, 32, 32, 80, + 46, 32, 32, 161, 286, 45, 46, 56, 56, 56, + 56, 56, 46, 57, 57, 57, 57, 57, 102, 126, + 286, 541, 126, 102, 342, 342, 161, 161, 161, 540, + 102, 253, 253, 253, 253, 253, 371, 452, 371, 253, + 253, 253, 253, 253, 253, 460, 460, 462, 539, 538, + 452, 462, 536, 371, 535, 371, 557, 557, 557, 559, + 559, 560, 560, 561, 561, 534, 532, 530, 529, 528, + 527, 526, 524, 521, 520, 519, 515, 512, 511, 510, + 509, 508, 506, 505, 504, 503, 500, 499, 498, 497, + + 496, 495, 494, 493, 492, 490, 488, 487, 485, 484, + 483, 482, 481, 480, 479, 477, 475, 474, 473, 472, + 471, 468, 467, 465, 464, 461, 459, 458, 457, 451, + 450, 449, 445, 443, 441, 440, 439, 438, 437, 434, + 433, 431, 430, 428, 427, 426, 423, 422, 421, 420, + 419, 418, 417, 415, 414, 413, 412, 411, 410, 409, + 408, 407, 406, 405, 404, 402, 401, 397, 396, 395, + 394, 393, 392, 390, 389, 388, 387, 386, 385, 384, + 383, 382, 381, 380, 379, 378, 375, 374, 373, 372, + 370, 369, 368, 367, 366, 365, 364, 363, 362, 361, + + 360, 357, 356, 354, 353, 352, 351, 350, 349, 347, + 346, 345, 344, 341, 338, 337, 335, 334, 331, 330, + 329, 328, 327, 326, 325, 323, 322, 321, 319, 317, + 316, 315, 314, 313, 312, 310, 307, 306, 305, 304, + 303, 302, 301, 300, 299, 298, 297, 293, 291, 290, + 289, 288, 287, 285, 283, 282, 281, 278, 277, 276, + 275, 274, 273, 271, 269, 268, 267, 266, 264, 263, + 262, 261, 260, 259, 258, 257, 256, 255, 254, 252, + 251, 250, 249, 248, 247, 245, 244, 243, 242, 241, + 240, 239, 238, 236, 235, 234, 233, 231, 230, 229, + + 228, 227, 226, 224, 223, 222, 221, 220, 219, 218, + 217, 216, 215, 214, 213, 212, 211, 210, 209, 208, + 206, 205, 204, 203, 202, 200, 199, 198, 197, 195, + 194, 193, 192, 191, 190, 189, 188, 187, 186, 185, + 184, 183, 182, 181, 180, 179, 177, 176, 175, 173, + 172, 171, 169, 168, 167, 166, 165, 164, 163, 162, + 160, 159, 158, 157, 156, 155, 154, 153, 152, 151, + 150, 148, 147, 146, 145, 144, 143, 141, 140, 139, + 138, 137, 136, 135, 134, 133, 132, 131, 130, 129, + 127, 125, 124, 123, 122, 121, 120, 119, 118, 116, + + 114, 113, 112, 110, 109, 108, 107, 106, 104, 103, + 101, 100, 99, 98, 97, 96, 95, 94, 92, 91, + 90, 89, 88, 87, 86, 85, 84, 83, 82, 81, + 79, 78, 77, 76, 75, 74, 73, 72, 71, 70, + 69, 68, 67, 66, 64, 63, 62, 60, 59, 52, + 51, 50, 49, 43, 38, 37, 36, 35, 34, 22, + 16, 15, 3, 556, 556, 556, 556, 556, 556, 556, + 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, + 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, + 556, 556, 556, 556, 556, 556, 556, 556, 556, 556, + + 556, 556, 556, 556, 556, 556, 556, 556, 556 + } ; + +static yy_state_type yy_last_accepting_state; +static char *yy_last_accepting_cpos; + +/* The intent behind this definition is that it'll catch + * any uses of REJECT which flex missed. + */ +#define REJECT reject_used_but_not_detected +#define yymore() yymore_used_but_not_detected +#define YY_MORE_ADJ 0 +#define YY_RESTORE_YY_MORE_OFFSET +char *yytext; +#line 1 "lexer.lxx" +#define INITIAL 0 +/* +// Filename: lexer.l +// Created by: drose (16Jan99) +// +//////////////////////////////////////////////////////////////////// +*/ +#line 9 "lexer.lxx" +#include "lexerDefs.h" +#include "parserDefs.h" +#include "config_egg.h" +#include "parser.h" + +#include +#include + +#include +#include + +extern "C" int eggyywrap(void); // declared below. + +static int yyinput(void); // declared by flex. + + +//////////////////////////////////////////////////////////////////// +// Static variables +//////////////////////////////////////////////////////////////////// + +// We'll increment line_number and col_number as we parse the file, so +// that we can report the position of an error. +static int line_number = 0; +static int col_number = 0; + +// current_line holds as much of the current line as will fit. Its +// only purpose is for printing it out to report an error to the user. +static const int max_error_width = 1024; +static char current_line[max_error_width + 1]; + +static int error_count = 0; +static int warning_count = 0; + +// This is the pointer to the current input stream. +static istream *inp = NULL; + +// This is the name of the egg file we're parsing. We keep it so we +// can print it out for error messages. +static string egg_filename; + +// This is the initial token state returned by the lexer. It allows +// the yacc grammar to start from initial points. +static int initial_token; + + +//////////////////////////////////////////////////////////////////// +// Defining the interface to the lexer. +//////////////////////////////////////////////////////////////////// + +void +egg_init_lexer(istream &in, const string &filename) { + inp = ∈ + egg_filename = filename; + line_number = 0; + col_number = 0; + error_count = 0; + warning_count = 0; + initial_token = START_EGG; +} + +void +egg_start_group_body() { + /* Set the initial state to begin within a group_body context, + instead of at the beginning of the egg file. */ + initial_token = START_GROUP_BODY; +} + +void +egg_start_texture_body() { + initial_token = START_TEXTURE_BODY; +} + +void +egg_start_primitive_body() { + initial_token = START_PRIMITIVE_BODY; +} + +int +egg_error_count() { + return error_count; +} + +int +egg_warning_count() { + return warning_count; +} + + +//////////////////////////////////////////////////////////////////// +// Internal support functions. +//////////////////////////////////////////////////////////////////// + +int +eggyywrap(void) { + return 1; +} + +void +eggyyerror(const string &msg) { + if (egg_cat.is_error()) { + ostream &out = egg_cat.error(false); + + out << "\nError"; + if (!egg_filename.empty()) { + out << " in " << egg_filename; + } + out + << " at line " << line_number << ", column " << col_number << ":\n" + << setiosflags(Notify::get_literal_flag()) + << current_line << "\n"; + indent(out, col_number-1) + << "^\n" << msg << "\n\n" + << resetiosflags(Notify::get_literal_flag()) << flush; + } + error_count++; +} + +void +eggyyerror(ostringstream &strm) { + string s = strm.str(); + eggyyerror(s); +} + +void +eggyywarning(const string &msg) { + if (egg_cat.is_warning()) { + ostream &out = egg_cat.warning(false); + + out << "\nWarning"; + if (!egg_filename.empty()) { + out << " in " << egg_filename; + } + out + << " at line " << line_number << ", column " << col_number << ":\n" + << setiosflags(Notify::get_literal_flag()) + << current_line << "\n"; + indent(out, col_number-1) + << "^\n" << msg << "\n\n" + << resetiosflags(Notify::get_literal_flag()) << flush; + } + warning_count++; +} + +void +eggyywarning(ostringstream &strm) { + string s = strm.str(); + eggyywarning(s); +} + +// Now define a function to take input from an istream instead of a +// stdio FILE pointer. This is flex-specific. +static void +input_chars(char *buffer, int &result, int max_size) { + nassertv(inp != NULL); + if (*inp) { + inp->read(buffer, max_size); + result = inp->gcount(); + + if (line_number == 0) { + // This is a special case. If we are reading the very first bit + // from the stream, copy it into the current_line array. This + // is because the \n.* rule below, which fills current_line + // normally, doesn't catch the first line. + int length = min(max_error_width, result); + strncpy(current_line, buffer, length); + current_line[length] = '\0'; + line_number++; + col_number = 0; + + // Truncate it at the newline. + char *end = strchr(current_line, '\n'); + if (end != NULL) { + *end = '\0'; + } + } + + } else { + // End of file or I/O error. + result = 0; + } +} +#undef YY_INPUT +#define YY_INPUT(buffer, result, max_size) input_chars(buffer, result, max_size) + +// read_char reads and returns a single character, incrementing the +// supplied line and column numbers as appropriate. A convenience +// function for the scanning functions below. +static int +read_char(int &line, int &col) { + int c = yyinput(); + if (c == '\n') { + line++; + col = 0; + } else { + col++; + } + return c; +} + +// scan_quoted_string reads a string delimited by quotation marks and +// returns it. +static string +scan_quoted_string() { + string result; + + // We don't touch the current line number and column number during + // scanning, so that if we detect an error while scanning the string + // (e.g. an unterminated string), we'll report the error as + // occurring at the start of the string, not at the end--somewhat + // more convenient for the user. + + // Instead of adjusting the global line_number and col_number + // variables, we'll operate on our own local variables for the + // interim. + int line = line_number; + int col = col_number; + + int c; + c = read_char(line, col); + while (c != '"' && c != EOF) { + result += c; + c = read_char(line, col); + } + + if (c == EOF) { + eggyyerror("This quotation mark is unterminated."); + } + + line_number = line; + col_number = col; + + return result; +} + +// eat_c_comment scans past all characters up until the first */ +// encountered. +static void +eat_c_comment() { + // As above, we'll operate on our own local copies of line_number + // and col_number within this function. + + int line = line_number; + int col = col_number; + + int c, last_c; + + last_c = '\0'; + c = read_char(line, col); + while (c != EOF && !(last_c == '*' && c == '/')) { + if (last_c == '/' && c == '*') { + ostringstream errmsg; + errmsg << "This comment contains a nested /* symbol at line " + << line << ", column " << col-1 << "--possibly unclosed?" + << ends; + eggyywarning(errmsg); + } + last_c = c; + c = read_char(line, col); + } + + if (c == EOF) { + eggyyerror("This comment marker is unclosed."); + } + + line_number = line; + col_number = col; +} + + +// accept() is called below as each piece is pulled off and +// accepted by the lexer; it increments the current column number. +INLINE void accept() { + col_number += yyleng; +} + +#line 1004 "lex.yy.c" + +/* Macros after this point can all be overridden by user definitions in + * section 1. + */ + +#ifndef YY_SKIP_YYWRAP +#ifdef __cplusplus +extern "C" int yywrap YY_PROTO(( void )); +#else +extern int yywrap YY_PROTO(( void )); +#endif +#endif + +#ifndef YY_NO_UNPUT +static void yyunput YY_PROTO(( int c, char *buf_ptr )); +#endif + +#ifndef yytext_ptr +static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int )); +#endif + +#ifdef YY_NEED_STRLEN +static int yy_flex_strlen YY_PROTO(( yyconst char * )); +#endif + +#ifndef YY_NO_INPUT +#ifdef __cplusplus +static int yyinput YY_PROTO(( void )); +#else +static int input YY_PROTO(( void )); +#endif +#endif + +#if YY_STACK_USED +static int yy_start_stack_ptr = 0; +static int yy_start_stack_depth = 0; +static int *yy_start_stack = 0; +#ifndef YY_NO_PUSH_STATE +static void yy_push_state YY_PROTO(( int new_state )); +#endif +#ifndef YY_NO_POP_STATE +static void yy_pop_state YY_PROTO(( void )); +#endif +#ifndef YY_NO_TOP_STATE +static int yy_top_state YY_PROTO(( void )); +#endif + +#else +#define YY_NO_PUSH_STATE 1 +#define YY_NO_POP_STATE 1 +#define YY_NO_TOP_STATE 1 +#endif + +#ifdef YY_MALLOC_DECL +YY_MALLOC_DECL +#else +#if __STDC__ +#ifndef __cplusplus +#include +#endif +#else +/* Just try to get by without declaring the routines. This will fail + * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int) + * or sizeof(void*) != sizeof(int). + */ +#endif +#endif + +/* Amount of stuff to slurp up with each read. */ +#ifndef YY_READ_BUF_SIZE +#define YY_READ_BUF_SIZE 8192 +#endif + +/* Copy whatever the last rule matched to the standard output. */ + +#ifndef ECHO +/* This used to be an fputs(), but since the string might contain NUL's, + * we now use fwrite(). + */ +#define ECHO (void) fwrite( yytext, yyleng, 1, yyout ) +#endif + +/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, + * is returned in "result". + */ +#ifndef YY_INPUT +#define YY_INPUT(buf,result,max_size) \ + if ( yy_current_buffer->yy_is_interactive ) \ + { \ + int c = '*', n; \ + for ( n = 0; n < max_size && \ + (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ + buf[n] = (char) c; \ + if ( c == '\n' ) \ + buf[n++] = (char) c; \ + if ( c == EOF && ferror( yyin ) ) \ + YY_FATAL_ERROR( "input in flex scanner failed" ); \ + result = n; \ + } \ + else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \ + && ferror( yyin ) ) \ + YY_FATAL_ERROR( "input in flex scanner failed" ); +#endif + +/* No semi-colon after return; correct usage is to write "yyterminate();" - + * we don't want an extra ';' after the "return" because that will cause + * some compilers to complain about unreachable statements. + */ +#ifndef yyterminate +#define yyterminate() return YY_NULL +#endif + +/* Number of entries by which start-condition stack grows. */ +#ifndef YY_START_STACK_INCR +#define YY_START_STACK_INCR 25 +#endif + +/* Report a fatal error. */ +#ifndef YY_FATAL_ERROR +#define YY_FATAL_ERROR(msg) yy_fatal_error( msg ) +#endif + +/* Default declaration of generated scanner - a define so the user can + * easily add parameters. + */ +#ifndef YY_DECL +#define YY_DECL int yylex YY_PROTO(( void )) +#endif + +/* Code executed at the beginning of each rule, after yytext and yyleng + * have been set up. + */ +#ifndef YY_USER_ACTION +#define YY_USER_ACTION +#endif + +/* Code executed at the end of each rule. */ +#ifndef YY_BREAK +#define YY_BREAK break; +#endif + +#define YY_RULE_SETUP \ + YY_USER_ACTION + +YY_DECL + { + register yy_state_type yy_current_state; + register char *yy_cp = NULL, *yy_bp = NULL; + register int yy_act; + +#line 290 "lexer.lxx" + + + + if (initial_token != 0) { + int t = initial_token; + initial_token = 0; + return t; + } + + +#line 1166 "lex.yy.c" + + if ( yy_init ) + { + yy_init = 0; + +#ifdef YY_USER_INIT + YY_USER_INIT; +#endif + + if ( ! yy_start ) + yy_start = 1; /* first start state */ + + if ( ! yyin ) + yyin = stdin; + + if ( ! yyout ) + yyout = stdout; + + if ( ! yy_current_buffer ) + yy_current_buffer = + yy_create_buffer( yyin, YY_BUF_SIZE ); + + yy_load_buffer_state(); + } + + while ( 1 ) /* loops until end-of-file is reached */ + { + yy_cp = yy_c_buf_p; + + /* Support of yytext. */ + *yy_cp = yy_hold_char; + + /* yy_bp points to the position in yy_ch_buf of the start of + * the current run. + */ + yy_bp = yy_cp; + + yy_current_state = yy_start; +yy_match: + do + { + register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)]; + if ( yy_accept[yy_current_state] ) + { + yy_last_accepting_state = yy_current_state; + yy_last_accepting_cpos = yy_cp; + } + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 557 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + ++yy_cp; + } + while ( yy_base[yy_current_state] != 664 ); + +yy_find_action: + yy_act = yy_accept[yy_current_state]; + if ( yy_act == 0 ) + { /* have to back up */ + yy_cp = yy_last_accepting_cpos; + yy_current_state = yy_last_accepting_state; + yy_act = yy_accept[yy_current_state]; + } + + YY_DO_BEFORE_ACTION; + + +do_action: /* This label is used only to access EOF actions. */ + + + switch ( yy_act ) + { /* beginning of action switch */ + case 0: /* must back up */ + /* undo the effects of YY_DO_BEFORE_ACTION */ + *yy_cp = yy_hold_char; + yy_cp = yy_last_accepting_cpos; + yy_current_state = yy_last_accepting_state; + goto yy_find_action; + +case 1: +YY_RULE_SETUP +#line 300 "lexer.lxx" +{ + // New line. Save a copy of the line so we can print it out for the + // benefit of the user in case we get an error. + + strncpy(current_line, yytext+1, max_error_width); + current_line[max_error_width] = '\0'; + line_number++; + col_number=0; + + // Return the whole line to the lexer, except the newline character, + // which we eat. + yyless(1); +} + YY_BREAK +case 2: +YY_RULE_SETUP +#line 314 "lexer.lxx" +{ + // Eat whitespace. + accept(); +} + YY_BREAK +case 3: +YY_RULE_SETUP +#line 319 "lexer.lxx" +{ + // Eat C++-style comments. + accept(); +} + YY_BREAK +case 4: +YY_RULE_SETUP +#line 324 "lexer.lxx" +{ + // Eat C-style comments. + accept(); + eat_c_comment(); +} + YY_BREAK +case 5: +YY_RULE_SETUP +#line 330 "lexer.lxx" +{ + // Send curly braces as themselves. + accept(); + return eggyytext[0]; +} + YY_BREAK +case 6: +YY_RULE_SETUP +#line 338 "lexer.lxx" +{ + accept(); + return BEZIERCURVE; +} + YY_BREAK +case 7: +YY_RULE_SETUP +#line 342 "lexer.lxx" +{ + accept(); + return BFACE; +} + YY_BREAK +case 8: +YY_RULE_SETUP +#line 346 "lexer.lxx" +{ + accept(); + return BILLBOARD; +} + YY_BREAK +case 9: +YY_RULE_SETUP +#line 350 "lexer.lxx" +{ + accept(); + return BILLBOARDCENTER; +} + YY_BREAK +case 10: +YY_RULE_SETUP +#line 354 "lexer.lxx" +{ + accept(); + return BINORMAL; +} + YY_BREAK +case 11: +YY_RULE_SETUP +#line 358 "lexer.lxx" +{ + accept(); + return BUNDLE; +} + YY_BREAK +case 12: +YY_RULE_SETUP +#line 362 "lexer.lxx" +{ + accept(); + return SCALAR; +} + YY_BREAK +case 13: +YY_RULE_SETUP +#line 366 "lexer.lxx" +{ + accept(); + return CLOSED; +} + YY_BREAK +case 14: +YY_RULE_SETUP +#line 370 "lexer.lxx" +{ + accept(); + return COLLIDE; +} + YY_BREAK +case 15: +YY_RULE_SETUP +#line 374 "lexer.lxx" +{ + accept(); + return COMMENT; +} + YY_BREAK +case 16: +YY_RULE_SETUP +#line 378 "lexer.lxx" +{ + accept(); + return COMPONENT; +} + YY_BREAK +case 17: +YY_RULE_SETUP +#line 382 "lexer.lxx" +{ + accept(); + return COORDSYSTEM; +} + YY_BREAK +case 18: +YY_RULE_SETUP +#line 386 "lexer.lxx" +{ + accept(); + return CV; +} + YY_BREAK +case 19: +YY_RULE_SETUP +#line 390 "lexer.lxx" +{ + accept(); + return DART; +} + YY_BREAK +case 20: +YY_RULE_SETUP +#line 394 "lexer.lxx" +{ + accept(); + return DNORMAL; +} + YY_BREAK +case 21: +YY_RULE_SETUP +#line 398 "lexer.lxx" +{ + accept(); + return DRGBA; +} + YY_BREAK +case 22: +YY_RULE_SETUP +#line 402 "lexer.lxx" +{ + accept(); + return DUV; +} + YY_BREAK +case 23: +YY_RULE_SETUP +#line 406 "lexer.lxx" +{ + accept(); + return DXYZ; +} + YY_BREAK +case 24: +YY_RULE_SETUP +#line 410 "lexer.lxx" +{ + accept(); + return DCS; +} + YY_BREAK +case 25: +YY_RULE_SETUP +#line 414 "lexer.lxx" +{ + accept(); + return DISTANCE; +} + YY_BREAK +case 26: +YY_RULE_SETUP +#line 418 "lexer.lxx" +{ + accept(); + return DTREF; +} + YY_BREAK +case 27: +YY_RULE_SETUP +#line 422 "lexer.lxx" +{ + accept(); + return DYNAMICVERTEXPOOL; +} + YY_BREAK +case 28: +YY_RULE_SETUP +#line 426 "lexer.lxx" +{ + accept(); + return EXTERNAL_FILE; +} + YY_BREAK +case 29: +YY_RULE_SETUP +#line 430 "lexer.lxx" +{ + accept(); + return FLIGHT; +} + YY_BREAK +case 30: +YY_RULE_SETUP +#line 434 "lexer.lxx" +{ + accept(); + return GROUP; +} + YY_BREAK +case 31: +YY_RULE_SETUP +#line 438 "lexer.lxx" +{ + accept(); + return HIP; +} + YY_BREAK +case 32: +YY_RULE_SETUP +#line 442 "lexer.lxx" +{ + accept(); + return INTANGENT; +} + YY_BREAK +case 33: +YY_RULE_SETUP +#line 446 "lexer.lxx" +{ + accept(); + return JOINT; +} + YY_BREAK +case 34: +YY_RULE_SETUP +#line 450 "lexer.lxx" +{ + accept(); + return KNOTS; +} + YY_BREAK +case 35: +YY_RULE_SETUP +#line 454 "lexer.lxx" +{ + accept(); + return INCLUDE; +} + YY_BREAK +case 36: +YY_RULE_SETUP +#line 458 "lexer.lxx" +{ + accept(); + return INSTANCE; +} + YY_BREAK +case 37: +YY_RULE_SETUP +#line 462 "lexer.lxx" +{ + accept(); + return LINE; +} + YY_BREAK +case 38: +YY_RULE_SETUP +#line 466 "lexer.lxx" +{ + accept(); + return LOOP; +} + YY_BREAK +case 39: +YY_RULE_SETUP +#line 470 "lexer.lxx" +{ + accept(); + return MATERIAL; +} + YY_BREAK +case 40: +YY_RULE_SETUP +#line 474 "lexer.lxx" +{ + accept(); + return MATRIX3; +} + YY_BREAK +case 41: +YY_RULE_SETUP +#line 478 "lexer.lxx" +{ + accept(); + return MATRIX4; +} + YY_BREAK +case 42: +YY_RULE_SETUP +#line 482 "lexer.lxx" +{ + accept(); + return MODEL; +} + YY_BREAK +case 43: +YY_RULE_SETUP +#line 486 "lexer.lxx" +{ + accept(); + return MREF; +} + YY_BREAK +case 44: +YY_RULE_SETUP +#line 490 "lexer.lxx" +{ + accept(); + return NORMAL; +} + YY_BREAK +case 45: +YY_RULE_SETUP +#line 494 "lexer.lxx" +{ + accept(); + return NURBSCURVE; +} + YY_BREAK +case 46: +YY_RULE_SETUP +#line 498 "lexer.lxx" +{ + accept(); + return NURBSSURFACE; +} + YY_BREAK +case 47: +YY_RULE_SETUP +#line 502 "lexer.lxx" +{ + accept(); + return OBJECTTYPE; +} + YY_BREAK +case 48: +YY_RULE_SETUP +#line 506 "lexer.lxx" +{ + accept(); + return ORDER; +} + YY_BREAK +case 49: +YY_RULE_SETUP +#line 510 "lexer.lxx" +{ + accept(); + return OUTTANGENT; +} + YY_BREAK +case 50: +YY_RULE_SETUP +#line 514 "lexer.lxx" +{ + accept(); + return POINTLIGHT; +} + YY_BREAK +case 51: +YY_RULE_SETUP +#line 518 "lexer.lxx" +{ + accept(); + return POLYGON; +} + YY_BREAK +case 52: +YY_RULE_SETUP +#line 522 "lexer.lxx" +{ + accept(); + return REF; +} + YY_BREAK +case 53: +YY_RULE_SETUP +#line 526 "lexer.lxx" +{ + accept(); + return RGBA; +} + YY_BREAK +case 54: +YY_RULE_SETUP +#line 530 "lexer.lxx" +{ + accept(); + return ROTATE; +} + YY_BREAK +case 55: +YY_RULE_SETUP +#line 534 "lexer.lxx" +{ + accept(); + return ROTX; +} + YY_BREAK +case 56: +YY_RULE_SETUP +#line 538 "lexer.lxx" +{ + accept(); + return ROTY; +} + YY_BREAK +case 57: +YY_RULE_SETUP +#line 542 "lexer.lxx" +{ + accept(); + return ROTZ; +} + YY_BREAK +case 58: +YY_RULE_SETUP +#line 546 "lexer.lxx" +{ + accept(); + return SANIM; +} + YY_BREAK +case 59: +YY_RULE_SETUP +#line 550 "lexer.lxx" +{ + accept(); + return SCALAR; +} + YY_BREAK +case 60: +YY_RULE_SETUP +#line 554 "lexer.lxx" +{ + accept(); + return SCALE; +} + YY_BREAK +case 61: +YY_RULE_SETUP +#line 558 "lexer.lxx" +{ + accept(); + return SEQUENCE; +} + YY_BREAK +case 62: +YY_RULE_SETUP +#line 562 "lexer.lxx" +{ + accept(); + return SHADING; +} + YY_BREAK +case 63: +YY_RULE_SETUP +#line 566 "lexer.lxx" +{ + accept(); + return SWITCH; +} + YY_BREAK +case 64: +YY_RULE_SETUP +#line 570 "lexer.lxx" +{ + accept(); + return SWITCHCONDITION; +} + YY_BREAK +case 65: +YY_RULE_SETUP +#line 574 "lexer.lxx" +{ + accept(); + return TABLE; +} + YY_BREAK +case 66: +YY_RULE_SETUP +#line 578 "lexer.lxx" +{ + accept(); + return TABLE_V; +} + YY_BREAK +case 67: +YY_RULE_SETUP +#line 582 "lexer.lxx" +{ + accept(); + return TAG; +} + YY_BREAK +case 68: +YY_RULE_SETUP +#line 586 "lexer.lxx" +{ + accept(); + return TANGENT; +} + YY_BREAK +case 69: +YY_RULE_SETUP +#line 590 "lexer.lxx" +{ + accept(); + return TEXLIST; +} + YY_BREAK +case 70: +YY_RULE_SETUP +#line 594 "lexer.lxx" +{ + accept(); + return TEXTURE; +} + YY_BREAK +case 71: +YY_RULE_SETUP +#line 598 "lexer.lxx" +{ + accept(); + return TLENGTHS; +} + YY_BREAK +case 72: +YY_RULE_SETUP +#line 602 "lexer.lxx" +{ + accept(); + return TRANSFORM; +} + YY_BREAK +case 73: +YY_RULE_SETUP +#line 606 "lexer.lxx" +{ + accept(); + return TRANSLATE; +} + YY_BREAK +case 74: +YY_RULE_SETUP +#line 610 "lexer.lxx" +{ + accept(); + return TREF; +} + YY_BREAK +case 75: +YY_RULE_SETUP +#line 614 "lexer.lxx" +{ + accept(); + return TRIANGLEFAN; +} + YY_BREAK +case 76: +YY_RULE_SETUP +#line 618 "lexer.lxx" +{ + accept(); + return TRIANGLESTRIP; +} + YY_BREAK +case 77: +YY_RULE_SETUP +#line 622 "lexer.lxx" +{ + accept(); + return TRIM; +} + YY_BREAK +case 78: +YY_RULE_SETUP +#line 626 "lexer.lxx" +{ + accept(); + return TXT; +} + YY_BREAK +case 79: +YY_RULE_SETUP +#line 630 "lexer.lxx" +{ + accept(); + return UKNOTS; +} + YY_BREAK +case 80: +YY_RULE_SETUP +#line 634 "lexer.lxx" +{ + accept(); + return UKNOTS; +} + YY_BREAK +case 81: +YY_RULE_SETUP +#line 638 "lexer.lxx" +{ + accept(); + return UV; +} + YY_BREAK +case 82: +YY_RULE_SETUP +#line 642 "lexer.lxx" +{ + accept(); + return VKNOTS; +} + YY_BREAK +case 83: +YY_RULE_SETUP +#line 646 "lexer.lxx" +{ + accept(); + return VKNOTS; +} + YY_BREAK +case 84: +YY_RULE_SETUP +#line 650 "lexer.lxx" +{ + accept(); + return VERTEX; +} + YY_BREAK +case 85: +YY_RULE_SETUP +#line 654 "lexer.lxx" +{ + accept(); + return VERTEXANIM; +} + YY_BREAK +case 86: +YY_RULE_SETUP +#line 658 "lexer.lxx" +{ + accept(); + return VERTEXPOOL; +} + YY_BREAK +case 87: +YY_RULE_SETUP +#line 662 "lexer.lxx" +{ + accept(); + return VERTEXREF; +} + YY_BREAK +case 88: +YY_RULE_SETUP +#line 666 "lexer.lxx" +{ + accept(); + return XFMANIM; +} + YY_BREAK +case 89: +YY_RULE_SETUP +#line 670 "lexer.lxx" +{ + accept(); + return XFMSANIM; +} + YY_BREAK +case 90: +YY_RULE_SETUP +#line 677 "lexer.lxx" +{ + // An integer or floating-point number. + accept(); + eggyylval._number = atof(eggyytext); + eggyylval._string = yytext; + return NUMBER; +} + YY_BREAK +case 91: +YY_RULE_SETUP +#line 685 "lexer.lxx" +{ + // A hexadecimal integer number. + accept(); + eggyylval._ulong = strtoul(yytext+2, NULL, 16); + eggyylval._string = yytext; + return ULONG; +} + YY_BREAK +case 92: +YY_RULE_SETUP +#line 693 "lexer.lxx" +{ + // A binary integer number. + accept(); + eggyylval._ulong = strtoul(yytext+2, NULL, 2); + eggyylval._string = yytext; + return ULONG; +} + YY_BREAK +case 93: +YY_RULE_SETUP +#line 701 "lexer.lxx" +{ + // not-a-number. These sometimes show up in egg files accidentally. + accept(); + memset(&eggyylval._number, 0, sizeof(eggyylval._number)); + *(unsigned long *)&eggyylval._number = strtoul(yytext+3, NULL, 0); + eggyylval._string = yytext; + return NUMBER; +} + YY_BREAK +case 94: +YY_RULE_SETUP +#line 710 "lexer.lxx" +{ + // infinity. As above. + accept(); + eggyylval._number = HUGE_VAL; + eggyylval._string = yytext; + return NUMBER; +} + YY_BREAK +case 95: +YY_RULE_SETUP +#line 718 "lexer.lxx" +{ + // minus infinity. As above. + accept(); + eggyylval._number = -HUGE_VAL; + eggyylval._string = yytext; + return NUMBER; +} + YY_BREAK +case 96: +YY_RULE_SETUP +#line 727 "lexer.lxx" +{ + // Quoted string. + accept(); + eggyylval._string = scan_quoted_string(); + return STRING; +} + YY_BREAK +case 97: +YY_RULE_SETUP +#line 734 "lexer.lxx" +{ + // Unquoted string. + accept(); + eggyylval._string = yytext; + return STRING; +} + YY_BREAK +case 98: +YY_RULE_SETUP +#line 740 "lexer.lxx" +ECHO; + YY_BREAK +#line 2064 "lex.yy.c" +case YY_STATE_EOF(INITIAL): + yyterminate(); + + case YY_END_OF_BUFFER: + { + /* Amount of text matched not including the EOB char. */ + int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1; + + /* Undo the effects of YY_DO_BEFORE_ACTION. */ + *yy_cp = yy_hold_char; + YY_RESTORE_YY_MORE_OFFSET + + if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW ) + { + /* We're scanning a new file or input source. It's + * possible that this happened because the user + * just pointed yyin at a new source and called + * yylex(). If so, then we have to assure + * consistency between yy_current_buffer and our + * globals. Here is the right place to do so, because + * this is the first action (other than possibly a + * back-up) that will match for the new input source. + */ + yy_n_chars = yy_current_buffer->yy_n_chars; + yy_current_buffer->yy_input_file = yyin; + yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL; + } + + /* Note that here we test for yy_c_buf_p "<=" to the position + * of the first EOB in the buffer, since yy_c_buf_p will + * already have been incremented past the NUL character + * (since all states make transitions on EOB to the + * end-of-buffer state). Contrast this with the test + * in input(). + */ + if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] ) + { /* This was really a NUL. */ + yy_state_type yy_next_state; + + yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text; + + yy_current_state = yy_get_previous_state(); + + /* Okay, we're now positioned to make the NUL + * transition. We couldn't have + * yy_get_previous_state() go ahead and do it + * for us because it doesn't know how to deal + * with the possibility of jamming (and we don't + * want to build jamming into it because then it + * will run more slowly). + */ + + yy_next_state = yy_try_NUL_trans( yy_current_state ); + + yy_bp = yytext_ptr + YY_MORE_ADJ; + + if ( yy_next_state ) + { + /* Consume the NUL. */ + yy_cp = ++yy_c_buf_p; + yy_current_state = yy_next_state; + goto yy_match; + } + + else + { + yy_cp = yy_c_buf_p; + goto yy_find_action; + } + } + + else switch ( yy_get_next_buffer() ) + { + case EOB_ACT_END_OF_FILE: + { + yy_did_buffer_switch_on_eof = 0; + + if ( yywrap() ) + { + /* Note: because we've taken care in + * yy_get_next_buffer() to have set up + * yytext, we can now set up + * yy_c_buf_p so that if some total + * hoser (like flex itself) wants to + * call the scanner after we return the + * YY_NULL, it'll still work - another + * YY_NULL will get returned. + */ + yy_c_buf_p = yytext_ptr + YY_MORE_ADJ; + + yy_act = YY_STATE_EOF(YY_START); + goto do_action; + } + + else + { + if ( ! yy_did_buffer_switch_on_eof ) + YY_NEW_FILE; + } + break; + } + + case EOB_ACT_CONTINUE_SCAN: + yy_c_buf_p = + yytext_ptr + yy_amount_of_matched_text; + + yy_current_state = yy_get_previous_state(); + + yy_cp = yy_c_buf_p; + yy_bp = yytext_ptr + YY_MORE_ADJ; + goto yy_match; + + case EOB_ACT_LAST_MATCH: + yy_c_buf_p = + &yy_current_buffer->yy_ch_buf[yy_n_chars]; + + yy_current_state = yy_get_previous_state(); + + yy_cp = yy_c_buf_p; + yy_bp = yytext_ptr + YY_MORE_ADJ; + goto yy_find_action; + } + break; + } + + default: + YY_FATAL_ERROR( + "fatal flex scanner internal error--no action found" ); + } /* end of action switch */ + } /* end of scanning one token */ + } /* end of yylex */ + + +/* yy_get_next_buffer - try to read in a new buffer + * + * Returns a code representing an action: + * EOB_ACT_LAST_MATCH - + * EOB_ACT_CONTINUE_SCAN - continue scanning from current position + * EOB_ACT_END_OF_FILE - end of file + */ + +static int yy_get_next_buffer() + { + register char *dest = yy_current_buffer->yy_ch_buf; + register char *source = yytext_ptr; + register int number_to_move, i; + int ret_val; + + if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] ) + YY_FATAL_ERROR( + "fatal flex scanner internal error--end of buffer missed" ); + + if ( yy_current_buffer->yy_fill_buffer == 0 ) + { /* Don't try to fill the buffer, so this is an EOF. */ + if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 ) + { + /* We matched a single character, the EOB, so + * treat this as a final EOF. + */ + return EOB_ACT_END_OF_FILE; + } + + else + { + /* We matched some text prior to the EOB, first + * process it. + */ + return EOB_ACT_LAST_MATCH; + } + } + + /* Try to read more data. */ + + /* First move last chars to start of buffer. */ + number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1; + + for ( i = 0; i < number_to_move; ++i ) + *(dest++) = *(source++); + + if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING ) + /* don't do the read, it's not guaranteed to return an EOF, + * just force an EOF + */ + yy_current_buffer->yy_n_chars = yy_n_chars = 0; + + else + { + int num_to_read = + yy_current_buffer->yy_buf_size - number_to_move - 1; + + while ( num_to_read <= 0 ) + { /* Not enough room in the buffer - grow it. */ +#ifdef YY_USES_REJECT + YY_FATAL_ERROR( +"input buffer overflow, can't enlarge buffer because scanner uses REJECT" ); +#else + + /* just a shorter name for the current buffer */ + YY_BUFFER_STATE b = yy_current_buffer; + + int yy_c_buf_p_offset = + (int) (yy_c_buf_p - b->yy_ch_buf); + + if ( b->yy_is_our_buffer ) + { + int new_size = b->yy_buf_size * 2; + + if ( new_size <= 0 ) + b->yy_buf_size += b->yy_buf_size / 8; + else + b->yy_buf_size *= 2; + + b->yy_ch_buf = (char *) + /* Include room in for 2 EOB chars. */ + yy_flex_realloc( (void *) b->yy_ch_buf, + b->yy_buf_size + 2 ); + } + else + /* Can't grow it, we don't own it. */ + b->yy_ch_buf = 0; + + if ( ! b->yy_ch_buf ) + YY_FATAL_ERROR( + "fatal error - scanner input buffer overflow" ); + + yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset]; + + num_to_read = yy_current_buffer->yy_buf_size - + number_to_move - 1; +#endif + } + + if ( num_to_read > YY_READ_BUF_SIZE ) + num_to_read = YY_READ_BUF_SIZE; + + /* Read in more data. */ + YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]), + yy_n_chars, num_to_read ); + + yy_current_buffer->yy_n_chars = yy_n_chars; + } + + if ( yy_n_chars == 0 ) + { + if ( number_to_move == YY_MORE_ADJ ) + { + ret_val = EOB_ACT_END_OF_FILE; + yyrestart( yyin ); + } + + else + { + ret_val = EOB_ACT_LAST_MATCH; + yy_current_buffer->yy_buffer_status = + YY_BUFFER_EOF_PENDING; + } + } + + else + ret_val = EOB_ACT_CONTINUE_SCAN; + + yy_n_chars += number_to_move; + yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR; + yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR; + + yytext_ptr = &yy_current_buffer->yy_ch_buf[0]; + + return ret_val; + } + + +/* yy_get_previous_state - get the state just before the EOB char was reached */ + +static yy_state_type yy_get_previous_state() + { + register yy_state_type yy_current_state; + register char *yy_cp; + + yy_current_state = yy_start; + + for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp ) + { + register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + if ( yy_accept[yy_current_state] ) + { + yy_last_accepting_state = yy_current_state; + yy_last_accepting_cpos = yy_cp; + } + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 557 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + } + + return yy_current_state; + } + + +/* yy_try_NUL_trans - try to make a transition on the NUL character + * + * synopsis + * next_state = yy_try_NUL_trans( current_state ); + */ + +#ifdef YY_USE_PROTOS +static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state ) +#else +static yy_state_type yy_try_NUL_trans( yy_current_state ) +yy_state_type yy_current_state; +#endif + { + register int yy_is_jam; + register char *yy_cp = yy_c_buf_p; + + register YY_CHAR yy_c = 1; + if ( yy_accept[yy_current_state] ) + { + yy_last_accepting_state = yy_current_state; + yy_last_accepting_cpos = yy_cp; + } + while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) + { + yy_current_state = (int) yy_def[yy_current_state]; + if ( yy_current_state >= 557 ) + yy_c = yy_meta[(unsigned int) yy_c]; + } + yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_is_jam = (yy_current_state == 556); + + return yy_is_jam ? 0 : yy_current_state; + } + + +#ifndef YY_NO_UNPUT +#ifdef YY_USE_PROTOS +static void yyunput( int c, register char *yy_bp ) +#else +static void yyunput( c, yy_bp ) +int c; +register char *yy_bp; +#endif + { + register char *yy_cp = yy_c_buf_p; + + /* undo effects of setting up yytext */ + *yy_cp = yy_hold_char; + + if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) + { /* need to shift things up to make room */ + /* +2 for EOB chars. */ + register int number_to_move = yy_n_chars + 2; + register char *dest = &yy_current_buffer->yy_ch_buf[ + yy_current_buffer->yy_buf_size + 2]; + register char *source = + &yy_current_buffer->yy_ch_buf[number_to_move]; + + while ( source > yy_current_buffer->yy_ch_buf ) + *--dest = *--source; + + yy_cp += (int) (dest - source); + yy_bp += (int) (dest - source); + yy_current_buffer->yy_n_chars = + yy_n_chars = yy_current_buffer->yy_buf_size; + + if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 ) + YY_FATAL_ERROR( "flex scanner push-back overflow" ); + } + + *--yy_cp = (char) c; + + + yytext_ptr = yy_bp; + yy_hold_char = *yy_cp; + yy_c_buf_p = yy_cp; + } +#endif /* ifndef YY_NO_UNPUT */ + + +#ifndef YY_NO_INPUT +#ifdef __cplusplus +static int yyinput() +#else +static int input() +#endif + { + int c; + + *yy_c_buf_p = yy_hold_char; + + if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR ) + { + /* yy_c_buf_p now points to the character we want to return. + * If this occurs *before* the EOB characters, then it's a + * valid NUL; if not, then we've hit the end of the buffer. + */ + if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] ) + /* This was really a NUL. */ + *yy_c_buf_p = '\0'; + + else + { /* need more input */ + int offset = yy_c_buf_p - yytext_ptr; + ++yy_c_buf_p; + + switch ( yy_get_next_buffer() ) + { + case EOB_ACT_LAST_MATCH: + /* This happens because yy_g_n_b() + * sees that we've accumulated a + * token and flags that we need to + * try matching the token before + * proceeding. But for input(), + * there's no matching to consider. + * So convert the EOB_ACT_LAST_MATCH + * to EOB_ACT_END_OF_FILE. + */ + + /* Reset buffer status. */ + yyrestart( yyin ); + + /* fall through */ + + case EOB_ACT_END_OF_FILE: + { + if ( yywrap() ) + return EOF; + + if ( ! yy_did_buffer_switch_on_eof ) + YY_NEW_FILE; +#ifdef __cplusplus + return yyinput(); +#else + return input(); +#endif + } + + case EOB_ACT_CONTINUE_SCAN: + yy_c_buf_p = yytext_ptr + offset; + break; + } + } + } + + c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */ + *yy_c_buf_p = '\0'; /* preserve yytext */ + yy_hold_char = *++yy_c_buf_p; + + + return c; + } +#endif /* YY_NO_INPUT */ + +#ifdef YY_USE_PROTOS +void yyrestart( FILE *input_file ) +#else +void yyrestart( input_file ) +FILE *input_file; +#endif + { + if ( ! yy_current_buffer ) + yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); + + yy_init_buffer( yy_current_buffer, input_file ); + yy_load_buffer_state(); + } + + +#ifdef YY_USE_PROTOS +void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer ) +#else +void yy_switch_to_buffer( new_buffer ) +YY_BUFFER_STATE new_buffer; +#endif + { + if ( yy_current_buffer == new_buffer ) + return; + + if ( yy_current_buffer ) + { + /* Flush out information for old buffer. */ + *yy_c_buf_p = yy_hold_char; + yy_current_buffer->yy_buf_pos = yy_c_buf_p; + yy_current_buffer->yy_n_chars = yy_n_chars; + } + + yy_current_buffer = new_buffer; + yy_load_buffer_state(); + + /* We don't actually know whether we did this switch during + * EOF (yywrap()) processing, but the only time this flag + * is looked at is after yywrap() is called, so it's safe + * to go ahead and always set it. + */ + yy_did_buffer_switch_on_eof = 1; + } + + +#ifdef YY_USE_PROTOS +void yy_load_buffer_state( void ) +#else +void yy_load_buffer_state() +#endif + { + yy_n_chars = yy_current_buffer->yy_n_chars; + yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos; + yyin = yy_current_buffer->yy_input_file; + yy_hold_char = *yy_c_buf_p; + } + + +#ifdef YY_USE_PROTOS +YY_BUFFER_STATE yy_create_buffer( FILE *file, int size ) +#else +YY_BUFFER_STATE yy_create_buffer( file, size ) +FILE *file; +int size; +#endif + { + YY_BUFFER_STATE b; + + b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + if ( ! b ) + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); + + b->yy_buf_size = size; + + /* yy_ch_buf has to be 2 characters longer than the size given because + * we need to put in 2 end-of-buffer characters. + */ + b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 ); + if ( ! b->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); + + b->yy_is_our_buffer = 1; + + yy_init_buffer( b, file ); + + return b; + } + + +#ifdef YY_USE_PROTOS +void yy_delete_buffer( YY_BUFFER_STATE b ) +#else +void yy_delete_buffer( b ) +YY_BUFFER_STATE b; +#endif + { + if ( ! b ) + return; + + if ( b == yy_current_buffer ) + yy_current_buffer = (YY_BUFFER_STATE) 0; + + if ( b->yy_is_our_buffer ) + yy_flex_free( (void *) b->yy_ch_buf ); + + yy_flex_free( (void *) b ); + } + + + +#ifdef YY_USE_PROTOS +void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) +#else +void yy_init_buffer( b, file ) +YY_BUFFER_STATE b; +FILE *file; +#endif + + + { + yy_flush_buffer( b ); + + b->yy_input_file = file; + b->yy_fill_buffer = 1; + +#if YY_ALWAYS_INTERACTIVE + b->yy_is_interactive = 1; +#else +#if YY_NEVER_INTERACTIVE + b->yy_is_interactive = 0; +#else + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0; +#endif +#endif + } + + +#ifdef YY_USE_PROTOS +void yy_flush_buffer( YY_BUFFER_STATE b ) +#else +void yy_flush_buffer( b ) +YY_BUFFER_STATE b; +#endif + + { + if ( ! b ) + return; + + b->yy_n_chars = 0; + + /* We always need two end-of-buffer characters. The first causes + * a transition to the end-of-buffer state. The second causes + * a jam in that state. + */ + b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR; + b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR; + + b->yy_buf_pos = &b->yy_ch_buf[0]; + + b->yy_at_bol = 1; + b->yy_buffer_status = YY_BUFFER_NEW; + + if ( b == yy_current_buffer ) + yy_load_buffer_state(); + } + + +#ifndef YY_NO_SCAN_BUFFER +#ifdef YY_USE_PROTOS +YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size ) +#else +YY_BUFFER_STATE yy_scan_buffer( base, size ) +char *base; +yy_size_t size; +#endif + { + YY_BUFFER_STATE b; + + if ( size < 2 || + base[size-2] != YY_END_OF_BUFFER_CHAR || + base[size-1] != YY_END_OF_BUFFER_CHAR ) + /* They forgot to leave room for the EOB's. */ + return 0; + + b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) ); + if ( ! b ) + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); + + b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_pos = b->yy_ch_buf = base; + b->yy_is_our_buffer = 0; + b->yy_input_file = 0; + b->yy_n_chars = b->yy_buf_size; + b->yy_is_interactive = 0; + b->yy_at_bol = 1; + b->yy_fill_buffer = 0; + b->yy_buffer_status = YY_BUFFER_NEW; + + yy_switch_to_buffer( b ); + + return b; + } +#endif + + +#ifndef YY_NO_SCAN_STRING +#ifdef YY_USE_PROTOS +YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str ) +#else +YY_BUFFER_STATE yy_scan_string( yy_str ) +yyconst char *yy_str; +#endif + { + int len; + for ( len = 0; yy_str[len]; ++len ) + ; + + return yy_scan_bytes( yy_str, len ); + } +#endif + + +#ifndef YY_NO_SCAN_BYTES +#ifdef YY_USE_PROTOS +YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len ) +#else +YY_BUFFER_STATE yy_scan_bytes( bytes, len ) +yyconst char *bytes; +int len; +#endif + { + YY_BUFFER_STATE b; + char *buf; + yy_size_t n; + int i; + + /* Get memory for full buffer, including space for trailing EOB's. */ + n = len + 2; + buf = (char *) yy_flex_alloc( n ); + if ( ! buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); + + for ( i = 0; i < len; ++i ) + buf[i] = bytes[i]; + + buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR; + + b = yy_scan_buffer( buf, n ); + if ( ! b ) + YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); + + /* It's okay to grow etc. this buffer, and we should throw it + * away when we're done. + */ + b->yy_is_our_buffer = 1; + + return b; + } +#endif + + +#ifndef YY_NO_PUSH_STATE +#ifdef YY_USE_PROTOS +static void yy_push_state( int new_state ) +#else +static void yy_push_state( new_state ) +int new_state; +#endif + { + if ( yy_start_stack_ptr >= yy_start_stack_depth ) + { + yy_size_t new_size; + + yy_start_stack_depth += YY_START_STACK_INCR; + new_size = yy_start_stack_depth * sizeof( int ); + + if ( ! yy_start_stack ) + yy_start_stack = (int *) yy_flex_alloc( new_size ); + + else + yy_start_stack = (int *) yy_flex_realloc( + (void *) yy_start_stack, new_size ); + + if ( ! yy_start_stack ) + YY_FATAL_ERROR( + "out of memory expanding start-condition stack" ); + } + + yy_start_stack[yy_start_stack_ptr++] = YY_START; + + BEGIN(new_state); + } +#endif + + +#ifndef YY_NO_POP_STATE +static void yy_pop_state() + { + if ( --yy_start_stack_ptr < 0 ) + YY_FATAL_ERROR( "start-condition stack underflow" ); + + BEGIN(yy_start_stack[yy_start_stack_ptr]); + } +#endif + + +#ifndef YY_NO_TOP_STATE +static int yy_top_state() + { + return yy_start_stack[yy_start_stack_ptr - 1]; + } +#endif + +#ifndef YY_EXIT_FAILURE +#define YY_EXIT_FAILURE 2 +#endif + +#ifdef YY_USE_PROTOS +static void yy_fatal_error( yyconst char msg[] ) +#else +static void yy_fatal_error( msg ) +char msg[]; +#endif + { + (void) fprintf( stderr, "%s\n", msg ); + exit( YY_EXIT_FAILURE ); + } + + + +/* Redefine yyless() so it works in section 3 code. */ + +#undef yyless +#define yyless(n) \ + do \ + { \ + /* Undo effects of setting up yytext. */ \ + yytext[yyleng] = yy_hold_char; \ + yy_c_buf_p = yytext + n; \ + yy_hold_char = *yy_c_buf_p; \ + *yy_c_buf_p = '\0'; \ + yyleng = n; \ + } \ + while ( 0 ) + + +/* Internal utility routines. */ + +#ifndef yytext_ptr +#ifdef YY_USE_PROTOS +static void yy_flex_strncpy( char *s1, yyconst char *s2, int n ) +#else +static void yy_flex_strncpy( s1, s2, n ) +char *s1; +yyconst char *s2; +int n; +#endif + { + register int i; + for ( i = 0; i < n; ++i ) + s1[i] = s2[i]; + } +#endif + +#ifdef YY_NEED_STRLEN +#ifdef YY_USE_PROTOS +static int yy_flex_strlen( yyconst char *s ) +#else +static int yy_flex_strlen( s ) +yyconst char *s; +#endif + { + register int n; + for ( n = 0; s[n]; ++n ) + ; + + return n; + } +#endif + + +#ifdef YY_USE_PROTOS +static void *yy_flex_alloc( yy_size_t size ) +#else +static void *yy_flex_alloc( size ) +yy_size_t size; +#endif + { + return (void *) malloc( size ); + } + +#ifdef YY_USE_PROTOS +static void *yy_flex_realloc( void *ptr, yy_size_t size ) +#else +static void *yy_flex_realloc( ptr, size ) +void *ptr; +yy_size_t size; +#endif + { + /* The cast to (char *) in the following accommodates both + * implementations that use char* generic pointers, and those + * that use void* generic pointers. It works with the latter + * because both ANSI C and C++ allow castless assignment from + * any pointer type to void*, and deal with argument conversions + * as though doing an assignment. + */ + return (void *) realloc( (char *) ptr, size ); + } + +#ifdef YY_USE_PROTOS +static void yy_flex_free( void *ptr ) +#else +static void yy_flex_free( ptr ) +void *ptr; +#endif + { + free( ptr ); + } + +#if YY_MAIN +int main() + { + yylex(); + return 0; + } +#endif +#line 740 "lexer.lxx" diff --git a/panda/src/egg/parser.cxx.prebuilt b/panda/src/egg/parser.cxx.prebuilt index a4ad6645fe..7958a7ac80 100644 --- a/panda/src/egg/parser.cxx.prebuilt +++ b/panda/src/egg/parser.cxx.prebuilt @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 1.875b. */ +/* A Bison parser, made by GNU Bison 2.0. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -45,8 +45,7 @@ /* Using locations. */ #define YYLSP_NEEDED 0 -/* If NAME_PREFIX is specified substitute the variables and functions - names. */ +/* Substitute the variable and function names. */ #define yyparse eggyyparse #define yylex eggyylex #define yyerror eggyyerror @@ -410,23 +409,26 @@ typedef int YYSTYPE; /* Copy the second part of user declarations. */ -/* Line 214 of yacc.c. */ -#line 415 "y.tab.c" +/* Line 213 of yacc.c. */ +#line 414 "y.tab.c" #if ! defined (yyoverflow) || YYERROR_VERBOSE +# ifndef YYFREE +# define YYFREE free +# endif +# ifndef YYMALLOC +# define YYMALLOC malloc +# endif + /* The parser invokes alloca or malloc; define the necessary symbols. */ -# if YYSTACK_USE_ALLOCA -# define YYSTACK_ALLOC alloca -# else -# ifndef YYSTACK_USE_ALLOCA -# if defined (alloca) || defined (_ALLOCA_H) -# define YYSTACK_ALLOC alloca +# ifdef YYSTACK_USE_ALLOCA +# if YYSTACK_USE_ALLOCA +# ifdef __GNUC__ +# define YYSTACK_ALLOC __builtin_alloca # else -# ifdef __GNUC__ -# define YYSTACK_ALLOC __builtin_alloca -# endif +# define YYSTACK_ALLOC alloca # endif # endif # endif @@ -439,20 +441,20 @@ typedef int YYSTYPE; # include /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # endif -# define YYSTACK_ALLOC malloc -# define YYSTACK_FREE free +# define YYSTACK_ALLOC YYMALLOC +# define YYSTACK_FREE YYFREE # endif #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */ #if (! defined (yyoverflow) \ && (! defined (__cplusplus) \ - || (YYSTYPE_IS_TRIVIAL))) + || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc { - short yyss; + short int yyss; YYSTYPE yyvs; }; @@ -462,13 +464,13 @@ union yyalloc /* The size of an array large to enough to hold all stacks, each with N elements. */ # define YYSTACK_BYTES(N) \ - ((N) * (sizeof (short) + sizeof (YYSTYPE)) \ + ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM) /* Copy COUNT objects from FROM to TO. The source and destination do not overlap. */ # ifndef YYCOPY -# if 1 < __GNUC__ +# if defined (__GNUC__) && 1 < __GNUC__ # define YYCOPY(To, From, Count) \ __builtin_memcpy (To, From, (Count) * sizeof (*(From))) # else @@ -504,22 +506,22 @@ union yyalloc #if defined (__STDC__) || defined (__cplusplus) typedef signed char yysigned_char; #else - typedef short yysigned_char; + typedef short int yysigned_char; #endif /* YYFINAL -- State number of the termination state. */ #define YYFINAL 14 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 1334 +#define YYLAST 1347 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 93 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 119 +#define YYNNTS 117 /* YYNRULES -- Number of rules. */ -#define YYNRULES 259 +#define YYNRULES 260 /* YYNRULES -- Number of states. */ -#define YYNSTATES 733 +#define YYNSTATES 729 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -571,182 +573,186 @@ static const unsigned char yytranslate[] = #if YYDEBUG /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in YYRHS. */ -static const unsigned short yyprhs[] = +static const unsigned short int yyprhs[] = { 0, 0, 3, 6, 9, 12, 15, 17, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 59, 65, 66, 74, 76, 83, 86, 87, 94, 96, 103, 109, 116, 117, 124, 126, 129, 130, 136, 137, 144, 146, 149, 153, - 158, 159, 167, 173, 179, 188, 197, 200, 208, 216, - 224, 232, 236, 245, 254, 259, 269, 279, 280, 287, - 288, 295, 296, 303, 305, 312, 318, 326, 334, 340, - 346, 352, 358, 364, 370, 376, 383, 389, 392, 395, - 398, 401, 403, 405, 408, 409, 415, 417, 420, 423, - 426, 429, 432, 435, 438, 445, 450, 455, 460, 468, - 475, 480, 485, 487, 504, 505, 511, 513, 516, 519, - 522, 525, 531, 536, 542, 547, 549, 559, 569, 571, - 578, 583, 595, 608, 609, 616, 617, 624, 625, 632, - 633, 640, 641, 648, 649, 656, 657, 664, 666, 672, - 678, 680, 681, 689, 695, 701, 707, 710, 716, 722, - 728, 735, 737, 743, 749, 755, 758, 764, 770, 776, - 782, 788, 794, 797, 803, 810, 812, 818, 824, 830, - 833, 839, 845, 851, 857, 863, 870, 872, 874, 876, - 880, 889, 898, 903, 913, 923, 925, 934, 937, 939, - 941, 943, 949, 951, 954, 956, 958, 959, 966, 967, - 974, 976, 979, 982, 985, 988, 991, 992, 999, 1001, - 1008, 1014, 1015, 1022, 1024, 1031, 1037, 1038, 1045, 1047, - 1054, 1057, 1059, 1062, 1064, 1067, 1069, 1071, 1073, 1075, - 1077, 1079, 1081, 1083, 1085, 1087, 1089, 1091, 1093, 1095, - 1097, 1099, 1102, 1104, 1106, 1108, 1110, 1112, 1114, 1116 + 158, 159, 167, 173, 179, 188, 197, 200, 204, 212, + 220, 228, 237, 245, 254, 258, 267, 276, 281, 291, + 301, 302, 309, 310, 317, 318, 325, 327, 334, 340, + 348, 356, 362, 368, 374, 380, 386, 392, 398, 405, + 411, 414, 417, 420, 423, 425, 427, 430, 431, 437, + 439, 442, 445, 448, 451, 454, 457, 460, 463, 466, + 469, 472, 475, 481, 488, 493, 498, 503, 508, 516, + 522, 529, 534, 539, 541, 558, 563, 565, 582, 592, + 594, 601, 606, 618, 631, 632, 639, 640, 647, 648, + 655, 656, 663, 664, 671, 672, 679, 680, 687, 689, + 695, 701, 703, 704, 712, 718, 724, 730, 733, 739, + 745, 751, 758, 760, 766, 772, 778, 781, 787, 793, + 799, 805, 811, 817, 820, 826, 833, 835, 841, 847, + 853, 856, 862, 868, 874, 880, 886, 893, 895, 897, + 899, 903, 912, 921, 926, 936, 946, 948, 957, 960, + 962, 964, 966, 972, 974, 977, 979, 981, 982, 989, + 990, 997, 999, 1002, 1005, 1008, 1011, 1014, 1015, 1022, + 1024, 1031, 1037, 1038, 1045, 1047, 1054, 1060, 1061, 1068, + 1070, 1077, 1080, 1082, 1085, 1087, 1090, 1092, 1094, 1096, + 1098, 1100, 1102, 1104, 1106, 1108, 1110, 1112, 1114, 1116, + 1118, 1120, 1122, 1125, 1127, 1129, 1131, 1133, 1135, 1137, + 1139 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ -static const short yyrhs[] = +static const short int yyrhs[] = { 94, 0, -1, 87, 95, -1, 88, 123, -1, 89, - 101, -1, 90, 164, -1, 211, -1, 95, 96, -1, + 101, -1, 90, 162, -1, 209, -1, 95, 96, -1, 97, -1, 98, -1, 99, -1, 102, -1, 105, -1, - 106, -1, 117, -1, 119, -1, 121, -1, 149, -1, - 151, -1, 153, -1, 155, -1, 157, -1, 159, -1, - 161, -1, 182, -1, 16, 91, 203, 92, -1, 14, - 202, 91, 206, 92, -1, -1, 69, 201, 91, 203, - 100, 101, 92, -1, 211, -1, 101, 58, 201, 91, - 209, 92, -1, 101, 137, -1, -1, 38, 201, 91, - 103, 104, 92, -1, 211, -1, 104, 58, 201, 91, - 209, 92, -1, 27, 202, 91, 203, 92, -1, 205, - 27, 202, 91, 203, 92, -1, -1, 83, 201, 107, - 91, 108, 92, -1, 211, -1, 108, 109, -1, -1, - 81, 110, 91, 112, 92, -1, -1, 81, 210, 111, - 91, 112, 92, -1, 208, -1, 208, 208, -1, 208, - 208, 208, -1, 208, 208, 208, 208, -1, -1, 112, - 79, 202, 91, 113, 114, 92, -1, 112, 43, 91, + 106, -1, 117, -1, 119, -1, 121, -1, 147, -1, + 149, -1, 151, -1, 153, -1, 155, -1, 157, -1, + 159, -1, 180, -1, 16, 91, 201, 92, -1, 14, + 200, 91, 204, 92, -1, -1, 69, 199, 91, 201, + 100, 101, 92, -1, 209, -1, 101, 58, 199, 91, + 207, 92, -1, 101, 126, -1, -1, 38, 199, 91, + 103, 104, 92, -1, 209, -1, 104, 58, 199, 91, + 207, 92, -1, 27, 200, 91, 201, 92, -1, 203, + 27, 200, 91, 201, 92, -1, -1, 83, 199, 107, + 91, 108, 92, -1, 209, -1, 108, 109, -1, -1, + 81, 110, 91, 112, 92, -1, -1, 81, 208, 111, + 91, 112, 92, -1, 206, -1, 206, 206, -1, 206, + 206, 206, -1, 206, 206, 206, 206, -1, -1, 112, + 79, 200, 91, 113, 114, 92, -1, 112, 43, 91, 115, 92, -1, 112, 52, 91, 116, 92, -1, 112, - 22, 205, 91, 208, 208, 208, 92, -1, 112, 22, - 91, 205, 208, 208, 208, 92, -1, 208, 208, -1, - 114, 67, 91, 208, 208, 208, 92, -1, 114, 10, - 91, 208, 208, 208, 92, -1, 114, 21, 205, 91, - 208, 208, 92, -1, 114, 21, 91, 205, 208, 208, - 92, -1, 208, 208, 208, -1, 115, 19, 205, 91, - 208, 208, 208, 92, -1, 115, 19, 91, 205, 208, - 208, 208, 92, -1, 208, 208, 208, 208, -1, 116, - 20, 205, 91, 208, 208, 208, 208, 92, -1, 116, - 20, 91, 205, 208, 208, 208, 208, 92, -1, -1, - 29, 202, 118, 91, 123, 92, -1, -1, 32, 202, - 120, 91, 123, 92, -1, -1, 35, 202, 122, 91, - 123, 92, -1, 211, -1, 123, 58, 201, 91, 209, - 92, -1, 123, 8, 91, 205, 92, -1, 123, 9, - 91, 208, 208, 208, 92, -1, 123, 13, 202, 91, - 124, 125, 92, -1, 123, 23, 91, 210, 92, -1, - 123, 23, 91, 5, 92, -1, 123, 18, 91, 210, - 92, -1, 123, 18, 91, 5, 92, -1, 123, 62, - 91, 210, 92, -1, 123, 46, 91, 203, 92, -1, - 123, 41, 91, 210, 92, -1, 123, 66, 202, 91, - 206, 92, -1, 123, 68, 91, 210, 92, -1, 123, - 126, -1, 123, 145, -1, 123, 147, -1, 123, 96, - -1, 205, -1, 211, -1, 125, 205, -1, -1, 71, - 127, 91, 128, 92, -1, 211, -1, 128, 129, -1, - 128, 130, -1, 128, 131, -1, 128, 132, -1, 128, - 133, -1, 128, 134, -1, 128, 135, -1, 72, 91, - 208, 208, 208, 92, -1, 54, 91, 208, 92, -1, - 55, 91, 208, 92, -1, 56, 91, 208, 92, -1, - 53, 91, 208, 208, 208, 208, 92, -1, 59, 91, - 208, 208, 208, 92, -1, 59, 91, 208, 92, -1, - 40, 91, 136, 92, -1, 211, -1, 208, 208, 208, - 208, 208, 208, 208, 208, 208, 208, 208, 208, 208, - 208, 208, 208, -1, -1, 71, 138, 91, 139, 92, - -1, 211, -1, 139, 143, -1, 139, 140, -1, 139, - 141, -1, 139, 142, -1, 72, 91, 208, 208, 92, - -1, 53, 91, 208, 92, -1, 59, 91, 208, 208, - 92, -1, 39, 91, 144, 92, -1, 211, -1, 208, - 208, 208, 208, 208, 208, 208, 208, 208, -1, 84, - 91, 196, 146, 51, 91, 200, 92, 92, -1, 211, - -1, 146, 58, 201, 91, 209, 92, -1, 63, 91, - 148, 92, -1, 24, 91, 208, 208, 81, 91, 208, - 208, 208, 92, 92, -1, 24, 91, 208, 208, 208, - 81, 91, 208, 208, 208, 92, 92, -1, -1, 50, - 202, 150, 91, 164, 92, -1, -1, 74, 202, 152, - 91, 164, 92, -1, -1, 75, 202, 154, 91, 164, - 92, -1, -1, 49, 202, 156, 91, 164, 92, -1, - -1, 36, 202, 158, 91, 164, 92, -1, -1, 45, - 202, 160, 91, 166, 92, -1, -1, 44, 202, 162, - 91, 167, 92, -1, 211, -1, 163, 43, 91, 171, - 92, -1, 163, 52, 91, 172, 92, -1, 211, -1, - -1, 164, 15, 210, 91, 165, 163, 92, -1, 164, - 73, 91, 168, 92, -1, 164, 69, 91, 169, 92, - -1, 164, 42, 91, 170, 92, -1, 164, 174, -1, - 164, 43, 91, 171, 92, -1, 164, 52, 91, 172, - 92, -1, 164, 7, 91, 173, 92, -1, 164, 58, - 201, 91, 209, 92, -1, 211, -1, 166, 73, 91, - 168, 92, -1, 166, 69, 91, 169, 92, -1, 166, - 42, 91, 170, 92, -1, 166, 174, -1, 166, 43, - 91, 171, 92, -1, 166, 52, 91, 172, 92, -1, - 166, 7, 91, 173, 92, -1, 166, 47, 91, 175, - 92, -1, 166, 78, 91, 176, 92, -1, 166, 80, - 91, 177, 92, -1, 166, 161, -1, 166, 76, 91, - 178, 92, -1, 166, 58, 201, 91, 209, 92, -1, - 211, -1, 167, 73, 91, 168, 92, -1, 167, 69, - 91, 169, 92, -1, 167, 42, 91, 170, 92, -1, - 167, 174, -1, 167, 43, 91, 171, 92, -1, 167, - 52, 91, 172, 92, -1, 167, 7, 91, 173, 92, - -1, 167, 47, 91, 180, 92, -1, 167, 33, 91, - 181, 92, -1, 167, 58, 201, 91, 209, 92, -1, - 198, -1, 201, -1, 199, -1, 208, 208, 208, -1, - 171, 19, 205, 91, 208, 208, 208, 92, -1, 171, - 19, 91, 205, 208, 208, 208, 92, -1, 208, 208, - 208, 208, -1, 172, 20, 205, 91, 208, 208, 208, - 208, 92, -1, 172, 20, 91, 205, 208, 208, 208, - 208, 92, -1, 210, -1, 84, 91, 196, 51, 91, - 200, 92, 92, -1, 210, 210, -1, 197, -1, 197, - -1, 211, -1, 178, 37, 91, 179, 92, -1, 211, - -1, 179, 161, -1, 210, -1, 197, -1, -1, 64, - 202, 183, 91, 186, 92, -1, -1, 11, 202, 185, - 91, 186, 92, -1, 211, -1, 186, 182, -1, 186, - 184, -1, 186, 187, -1, 186, 190, -1, 186, 193, - -1, -1, 57, 202, 188, 91, 189, 92, -1, 211, - -1, 189, 58, 201, 91, 209, 92, -1, 189, 65, - 91, 197, 92, -1, -1, 85, 202, 191, 91, 192, - 92, -1, 211, -1, 192, 58, 201, 91, 209, 92, - -1, 192, 65, 91, 197, 92, -1, -1, 86, 202, - 194, 91, 195, 92, -1, 211, -1, 195, 58, 201, - 91, 209, 92, -1, 195, 187, -1, 211, -1, 196, - 210, -1, 211, -1, 197, 208, -1, 201, -1, 201, - -1, 201, -1, 211, -1, 205, -1, 204, -1, 211, - -1, 205, -1, 211, -1, 205, -1, 3, -1, 4, - -1, 5, -1, 211, -1, 207, -1, 205, -1, 207, - 205, -1, 3, -1, 4, -1, 3, -1, 4, -1, - 5, -1, 3, -1, 4, -1, -1 + 22, 203, 91, 206, 206, 206, 92, -1, 112, 22, + 91, 203, 206, 206, 206, 92, -1, 206, 206, -1, + 206, 206, 206, -1, 114, 67, 91, 206, 206, 206, + 92, -1, 114, 10, 91, 206, 206, 206, 92, -1, + 114, 21, 203, 91, 206, 206, 92, -1, 114, 21, + 203, 91, 206, 206, 206, 92, -1, 114, 21, 91, + 203, 206, 206, 92, -1, 114, 21, 91, 203, 206, + 206, 206, 92, -1, 206, 206, 206, -1, 115, 19, + 203, 91, 206, 206, 206, 92, -1, 115, 19, 91, + 203, 206, 206, 206, 92, -1, 206, 206, 206, 206, + -1, 116, 20, 203, 91, 206, 206, 206, 206, 92, + -1, 116, 20, 91, 203, 206, 206, 206, 206, 92, + -1, -1, 29, 200, 118, 91, 123, 92, -1, -1, + 32, 200, 120, 91, 123, 92, -1, -1, 35, 200, + 122, 91, 123, 92, -1, 209, -1, 123, 58, 199, + 91, 207, 92, -1, 123, 8, 91, 203, 92, -1, + 123, 9, 91, 206, 206, 206, 92, -1, 123, 13, + 200, 91, 124, 125, 92, -1, 123, 23, 91, 208, + 92, -1, 123, 23, 91, 5, 92, -1, 123, 18, + 91, 208, 92, -1, 123, 18, 91, 5, 92, -1, + 123, 62, 91, 208, 92, -1, 123, 46, 91, 201, + 92, -1, 123, 41, 91, 208, 92, -1, 123, 66, + 200, 91, 204, 92, -1, 123, 68, 91, 208, 92, + -1, 123, 126, -1, 123, 143, -1, 123, 145, -1, + 123, 96, -1, 203, -1, 209, -1, 125, 203, -1, + -1, 71, 127, 91, 128, 92, -1, 209, -1, 128, + 129, -1, 128, 130, -1, 128, 131, -1, 128, 132, + -1, 128, 133, -1, 128, 134, -1, 128, 135, -1, + 128, 136, -1, 128, 137, -1, 128, 138, -1, 128, + 139, -1, 128, 141, -1, 72, 91, 206, 206, 92, + -1, 72, 91, 206, 206, 206, 92, -1, 53, 91, + 206, 92, -1, 54, 91, 206, 92, -1, 55, 91, + 206, 92, -1, 56, 91, 206, 92, -1, 53, 91, + 206, 206, 206, 206, 92, -1, 59, 91, 206, 206, + 92, -1, 59, 91, 206, 206, 206, 92, -1, 59, + 91, 206, 92, -1, 39, 91, 140, 92, -1, 209, + -1, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, -1, 40, 91, + 142, 92, -1, 209, -1, 206, 206, 206, 206, 206, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, -1, 84, 91, 194, 144, 51, 91, 198, 92, + 92, -1, 209, -1, 144, 58, 199, 91, 207, 92, + -1, 63, 91, 146, 92, -1, 24, 91, 206, 206, + 81, 91, 206, 206, 206, 92, 92, -1, 24, 91, + 206, 206, 206, 81, 91, 206, 206, 206, 92, 92, + -1, -1, 50, 200, 148, 91, 162, 92, -1, -1, + 74, 200, 150, 91, 162, 92, -1, -1, 75, 200, + 152, 91, 162, 92, -1, -1, 49, 200, 154, 91, + 162, 92, -1, -1, 36, 200, 156, 91, 162, 92, + -1, -1, 45, 200, 158, 91, 164, 92, -1, -1, + 44, 200, 160, 91, 165, 92, -1, 209, -1, 161, + 43, 91, 169, 92, -1, 161, 52, 91, 170, 92, + -1, 209, -1, -1, 162, 15, 208, 91, 163, 161, + 92, -1, 162, 73, 91, 166, 92, -1, 162, 69, + 91, 167, 92, -1, 162, 42, 91, 168, 92, -1, + 162, 172, -1, 162, 43, 91, 169, 92, -1, 162, + 52, 91, 170, 92, -1, 162, 7, 91, 171, 92, + -1, 162, 58, 199, 91, 207, 92, -1, 209, -1, + 164, 73, 91, 166, 92, -1, 164, 69, 91, 167, + 92, -1, 164, 42, 91, 168, 92, -1, 164, 172, + -1, 164, 43, 91, 169, 92, -1, 164, 52, 91, + 170, 92, -1, 164, 7, 91, 171, 92, -1, 164, + 47, 91, 173, 92, -1, 164, 78, 91, 174, 92, + -1, 164, 80, 91, 175, 92, -1, 164, 159, -1, + 164, 76, 91, 176, 92, -1, 164, 58, 199, 91, + 207, 92, -1, 209, -1, 165, 73, 91, 166, 92, + -1, 165, 69, 91, 167, 92, -1, 165, 42, 91, + 168, 92, -1, 165, 172, -1, 165, 43, 91, 169, + 92, -1, 165, 52, 91, 170, 92, -1, 165, 7, + 91, 171, 92, -1, 165, 47, 91, 178, 92, -1, + 165, 33, 91, 179, 92, -1, 165, 58, 199, 91, + 207, 92, -1, 196, -1, 199, -1, 197, -1, 206, + 206, 206, -1, 169, 19, 203, 91, 206, 206, 206, + 92, -1, 169, 19, 91, 203, 206, 206, 206, 92, + -1, 206, 206, 206, 206, -1, 170, 20, 203, 91, + 206, 206, 206, 206, 92, -1, 170, 20, 91, 203, + 206, 206, 206, 206, 92, -1, 208, -1, 84, 91, + 194, 51, 91, 198, 92, 92, -1, 208, 208, -1, + 195, -1, 195, -1, 209, -1, 176, 37, 91, 177, + 92, -1, 209, -1, 177, 159, -1, 208, -1, 195, + -1, -1, 64, 200, 181, 91, 184, 92, -1, -1, + 11, 200, 183, 91, 184, 92, -1, 209, -1, 184, + 180, -1, 184, 182, -1, 184, 185, -1, 184, 188, + -1, 184, 191, -1, -1, 57, 200, 186, 91, 187, + 92, -1, 209, -1, 187, 58, 199, 91, 207, 92, + -1, 187, 65, 91, 195, 92, -1, -1, 85, 200, + 189, 91, 190, 92, -1, 209, -1, 190, 58, 199, + 91, 207, 92, -1, 190, 65, 91, 195, 92, -1, + -1, 86, 200, 192, 91, 193, 92, -1, 209, -1, + 193, 58, 199, 91, 207, 92, -1, 193, 185, -1, + 209, -1, 194, 208, -1, 209, -1, 195, 206, -1, + 199, -1, 199, -1, 199, -1, 209, -1, 203, -1, + 202, -1, 209, -1, 203, -1, 209, -1, 203, -1, + 3, -1, 4, -1, 5, -1, 209, -1, 205, -1, + 203, -1, 205, 203, -1, 3, -1, 4, -1, 3, + -1, 4, -1, 5, -1, 3, -1, 4, -1, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ -static const unsigned short yyrline[] = +static const unsigned short int yyrline[] = { 0, 216, 216, 217, 218, 219, 230, 231, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263, 274, 297, 312, 311, 339, 340, 625, 637, 636, 663, 664, 759, 766, 787, 786, 826, 827, 839, 838, 850, 849, 895, 899, 903, 907, - 912, 911, 926, 927, 928, 936, 955, 959, 967, 975, - 983, 1001, 1005, 1013, 1031, 1035, 1043, 1062, 1061, 1082, - 1081, 1103, 1102, 1123, 1124, 1254, 1266, 1271, 1278, 1284, - 1297, 1304, 1317, 1323, 1329, 1335, 1340, 1346, 1347, 1348, - 1349, 1363, 1393, 1394, 1417, 1416, 1432, 1433, 1434, 1435, - 1436, 1437, 1438, 1439, 1442, 1448, 1454, 1460, 1466, 1472, - 1476, 1483, 1487, 1488, 1511, 1510, 1529, 1530, 1531, 1532, - 1533, 1536, 1542, 1548, 1554, 1558, 1559, 1578, 1611, 1615, - 1640, 1652, 1657, 1675, 1674, 1694, 1693, 1713, 1712, 1732, - 1731, 1751, 1750, 1770, 1769, 1789, 1788, 1808, 1809, 1810, - 1821, 1823, 1822, 1843, 1844, 1845, 1846, 1847, 1848, 1849, - 1850, 1923, 1924, 1925, 1926, 1927, 1928, 1929, 1930, 1931, - 1932, 1933, 1934, 1940, 1941, 2005, 2006, 2007, 2008, 2009, - 2010, 2011, 2012, 2013, 2014, 2015, 2084, 2101, 2141, 2158, - 2162, 2170, 2188, 2192, 2200, 2218, 2234, 2265, 2283, 2303, - 2323, 2328, 2339, 2345, 2364, 2380, 2402, 2401, 2424, 2423, - 2445, 2446, 2450, 2454, 2458, 2462, 2478, 2477, 2498, 2499, - 2511, 2526, 2525, 2546, 2547, 2564, 2579, 2578, 2599, 2600, - 2615, 2630, 2634, 2648, 2652, 2666, 2687, 2708, 2734, 2739, - 2751, 2763, 2768, 2779, 2783, 2797, 2801, 2805, 2818, 2822, - 2838, 2842, 2856, 2857, 2872, 2878, 2884, 2901, 2909, 2915 + 912, 911, 926, 927, 928, 936, 955, 959, 963, 971, + 979, 987, 995, 1003, 1021, 1025, 1033, 1051, 1055, 1063, + 1082, 1081, 1102, 1101, 1123, 1122, 1143, 1144, 1274, 1286, + 1291, 1298, 1304, 1317, 1324, 1337, 1343, 1349, 1355, 1360, + 1366, 1367, 1368, 1369, 1383, 1413, 1414, 1437, 1436, 1452, + 1453, 1454, 1455, 1456, 1457, 1458, 1459, 1460, 1461, 1462, + 1463, 1464, 1468, 1475, 1482, 1489, 1496, 1503, 1510, 1517, + 1524, 1531, 1538, 1542, 1543, 1556, 1560, 1561, 1583, 1616, + 1620, 1645, 1657, 1662, 1680, 1679, 1699, 1698, 1718, 1717, + 1737, 1736, 1756, 1755, 1775, 1774, 1794, 1793, 1813, 1814, + 1815, 1826, 1828, 1827, 1848, 1849, 1850, 1851, 1852, 1853, + 1854, 1855, 1928, 1929, 1930, 1931, 1932, 1933, 1934, 1935, + 1936, 1937, 1938, 1939, 1945, 1946, 2010, 2011, 2012, 2013, + 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2089, 2106, 2146, + 2163, 2167, 2175, 2193, 2197, 2205, 2223, 2239, 2270, 2288, + 2308, 2328, 2333, 2344, 2350, 2369, 2385, 2407, 2406, 2429, + 2428, 2450, 2451, 2455, 2459, 2463, 2467, 2483, 2482, 2503, + 2504, 2516, 2531, 2530, 2551, 2552, 2569, 2584, 2583, 2604, + 2605, 2620, 2635, 2639, 2653, 2657, 2671, 2692, 2713, 2739, + 2744, 2756, 2768, 2773, 2784, 2788, 2802, 2806, 2810, 2823, + 2827, 2843, 2847, 2861, 2862, 2877, 2883, 2889, 2906, 2914, + 2920 }; #endif @@ -755,48 +761,47 @@ static const unsigned short yyrline[] = First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { - "$end", "error", "$undefined", "NUMBER", "ULONG", "STRING", "BEZIERCURVE", - "BFACE", "BILLBOARD", "BILLBOARDCENTER", "BINORMAL", "BUNDLE", "CLOSED", - "COLLIDE", "COMMENT", "COMPONENT", "COORDSYSTEM", "CV", "DART", - "DNORMAL", "DRGBA", "DUV", "DXYZ", "DCS", "DISTANCE", "DTREF", - "DYNAMICVERTEXPOOL", "EXTERNAL_FILE", "FLIGHT", "GROUP", "HIP", - "INTANGENT", "JOINT", "KNOTS", "INCLUDE", "INSTANCE", "LINE", "LOOP", - "MATERIAL", "MATRIX3", "MATRIX4", "MODEL", "MREF", "NORMAL", - "NURBSCURVE", "NURBSSURFACE", "OBJECTTYPE", "ORDER", "OUTTANGENT", - "POINTLIGHT", "POLYGON", "REF", "RGBA", "ROTATE", "ROTX", "ROTY", - "ROTZ", "SANIM", "SCALAR", "SCALE", "SEQUENCE", "SHADING", "SWITCH", - "SWITCHCONDITION", "TABLE", "TABLE_V", "TAG", "TANGENT", "TEXLIST", - "TEXTURE", "TLENGTHS", "TRANSFORM", "TRANSLATE", "TREF", "TRIANGLEFAN", - "TRIANGLESTRIP", "TRIM", "TXT", "UKNOTS", "UV", "VKNOTS", "VERTEX", - "VERTEXANIM", "VERTEXPOOL", "VERTEXREF", "XFMANIM", "XFMSANIM", - "START_EGG", "START_GROUP_BODY", "START_TEXTURE_BODY", - "START_PRIMITIVE_BODY", "'{'", "'}'", "$accept", "grammar", "egg", - "node", "coordsystem", "comment", "texture", "@1", "texture_body", - "material", "@2", "material_body", "external_reference", "vertex_pool", - "@3", "vertex_pool_body", "vertex", "@4", "@5", "vertex_body", "@6", - "vertex_uv_body", "vertex_normal_body", "vertex_color_body", "group", - "@7", "joint", "@8", "instance", "@9", "group_body", "cs_type", - "collide_flags", "transform_3d", "@10", "transform_3d_body", - "translate_3d", "rotx_3d", "roty_3d", "rotz_3d", "rotate_3d", - "scale_3d", "matrix4_3d", "matrix4_3d_body", "transform_2d", "@11", - "transform_2d_body", "translate_2d", "rotate_2d", "scale_2d", - "matrix3_2d", "matrix3_2d_body", "group_vertex_ref", - "group_vertex_membership", "switchcondition", "switchcondition_body", - "polygon", "@12", "trianglefan", "@13", "trianglestrip", "@14", - "point_light", "@15", "line", "@16", "nurbs_surface", "@17", - "nurbs_curve", "@18", "primitive_component_body", "primitive_body", - "@19", "nurbs_surface_body", "nurbs_curve_body", "primitive_tref_body", - "primitive_texture_body", "primitive_material_body", - "primitive_normal_body", "primitive_color_body", "primitive_bface_body", - "primitive_vertex_ref", "nurbs_surface_order_body", - "nurbs_surface_uknots_body", "nurbs_surface_vknots_body", - "nurbs_surface_trim_body", "nurbs_surface_trim_loop_body", - "nurbs_curve_order_body", "nurbs_curve_knots_body", "table", "@20", - "bundle", "@21", "table_body", "sanim", "@22", "sanim_body", "xfmanim", - "@23", "xfmanim_body", "xfm_s_anim", "@24", "xfm_s_anim_body", - "integer_list", "real_list", "texture_name", "material_name", - "vertex_pool_name", "required_name", "optional_name", "required_string", - "optional_string", "string", "repeated_string", "repeated_string_body", + "$end", "error", "$undefined", "NUMBER", "ULONG", "STRING", + "BEZIERCURVE", "BFACE", "BILLBOARD", "BILLBOARDCENTER", "BINORMAL", + "BUNDLE", "CLOSED", "COLLIDE", "COMMENT", "COMPONENT", "COORDSYSTEM", + "CV", "DART", "DNORMAL", "DRGBA", "DUV", "DXYZ", "DCS", "DISTANCE", + "DTREF", "DYNAMICVERTEXPOOL", "EXTERNAL_FILE", "FLIGHT", "GROUP", "HIP", + "INTANGENT", "JOINT", "KNOTS", "INCLUDE", "INSTANCE", "LINE", "LOOP", + "MATERIAL", "MATRIX3", "MATRIX4", "MODEL", "MREF", "NORMAL", + "NURBSCURVE", "NURBSSURFACE", "OBJECTTYPE", "ORDER", "OUTTANGENT", + "POINTLIGHT", "POLYGON", "REF", "RGBA", "ROTATE", "ROTX", "ROTY", "ROTZ", + "SANIM", "SCALAR", "SCALE", "SEQUENCE", "SHADING", "SWITCH", + "SWITCHCONDITION", "TABLE", "TABLE_V", "TAG", "TANGENT", "TEXLIST", + "TEXTURE", "TLENGTHS", "TRANSFORM", "TRANSLATE", "TREF", "TRIANGLEFAN", + "TRIANGLESTRIP", "TRIM", "TXT", "UKNOTS", "UV", "VKNOTS", "VERTEX", + "VERTEXANIM", "VERTEXPOOL", "VERTEXREF", "XFMANIM", "XFMSANIM", + "START_EGG", "START_GROUP_BODY", "START_TEXTURE_BODY", + "START_PRIMITIVE_BODY", "'{'", "'}'", "$accept", "grammar", "egg", + "node", "coordsystem", "comment", "texture", "@1", "texture_body", + "material", "@2", "material_body", "external_reference", "vertex_pool", + "@3", "vertex_pool_body", "vertex", "@4", "@5", "vertex_body", "@6", + "vertex_uv_body", "vertex_normal_body", "vertex_color_body", "group", + "@7", "joint", "@8", "instance", "@9", "group_body", "cs_type", + "collide_flags", "transform", "@10", "transform_body", "translate2d", + "translate3d", "rotate2d", "rotx", "roty", "rotz", "rotate3d", "scale2d", + "scale3d", "uniform_scale", "matrix3", "matrix3_body", "matrix4", + "matrix4_body", "group_vertex_ref", "group_vertex_membership", + "switchcondition", "switchcondition_body", "polygon", "@11", + "trianglefan", "@12", "trianglestrip", "@13", "point_light", "@14", + "line", "@15", "nurbs_surface", "@16", "nurbs_curve", "@17", + "primitive_component_body", "primitive_body", "@18", + "nurbs_surface_body", "nurbs_curve_body", "primitive_tref_body", + "primitive_texture_body", "primitive_material_body", + "primitive_normal_body", "primitive_color_body", "primitive_bface_body", + "primitive_vertex_ref", "nurbs_surface_order_body", + "nurbs_surface_uknots_body", "nurbs_surface_vknots_body", + "nurbs_surface_trim_body", "nurbs_surface_trim_loop_body", + "nurbs_curve_order_body", "nurbs_curve_knots_body", "table", "@19", + "bundle", "@20", "table_body", "sanim", "@21", "sanim_body", "xfmanim", + "@22", "xfmanim_body", "xfm_s_anim", "@23", "xfm_s_anim_body", + "integer_list", "real_list", "texture_name", "material_name", + "vertex_pool_name", "required_name", "optional_name", "required_string", + "optional_string", "string", "repeated_string", "repeated_string_body", "real", "real_or_string", "integer", "empty", 0 }; #endif @@ -804,7 +809,7 @@ static const char *const yytname[] = # ifdef YYPRINT /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to token YYLEX-NUM. */ -static const unsigned short yytoknum[] = +static const unsigned short int yytoknum[] = { 0, 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, @@ -828,26 +833,27 @@ static const unsigned char yyr1[] = 101, 101, 103, 102, 104, 104, 105, 105, 107, 106, 108, 108, 110, 109, 111, 109, 112, 112, 112, 112, 113, 112, 112, 112, 112, 112, 114, 114, 114, 114, - 114, 115, 115, 115, 116, 116, 116, 118, 117, 120, - 119, 122, 121, 123, 123, 123, 123, 123, 123, 123, + 114, 114, 114, 114, 115, 115, 115, 116, 116, 116, + 118, 117, 120, 119, 122, 121, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, - 123, 124, 125, 125, 127, 126, 128, 128, 128, 128, - 128, 128, 128, 128, 129, 130, 131, 132, 133, 134, - 134, 135, 136, 136, 138, 137, 139, 139, 139, 139, - 139, 140, 141, 142, 143, 144, 144, 145, 146, 146, - 147, 148, 148, 150, 149, 152, 151, 154, 153, 156, - 155, 158, 157, 160, 159, 162, 161, 163, 163, 163, - 164, 165, 164, 164, 164, 164, 164, 164, 164, 164, - 164, 166, 166, 166, 166, 166, 166, 166, 166, 166, - 166, 166, 166, 166, 166, 167, 167, 167, 167, 167, - 167, 167, 167, 167, 167, 167, 168, 169, 170, 171, - 171, 171, 172, 172, 172, 173, 174, 175, 176, 177, - 178, 178, 179, 179, 180, 181, 183, 182, 185, 184, - 186, 186, 186, 186, 186, 186, 188, 187, 189, 189, - 189, 191, 190, 192, 192, 192, 194, 193, 195, 195, - 195, 196, 196, 197, 197, 198, 199, 200, 201, 201, - 202, 203, 203, 204, 204, 205, 205, 205, 206, 206, - 207, 207, 208, 208, 209, 209, 209, 210, 210, 211 + 123, 123, 123, 123, 124, 125, 125, 127, 126, 128, + 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, + 128, 128, 129, 130, 131, 132, 133, 134, 135, 136, + 137, 138, 139, 140, 140, 141, 142, 142, 143, 144, + 144, 145, 146, 146, 148, 147, 150, 149, 152, 151, + 154, 153, 156, 155, 158, 157, 160, 159, 161, 161, + 161, 162, 163, 162, 162, 162, 162, 162, 162, 162, + 162, 162, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 166, 167, 168, + 169, 169, 169, 170, 170, 170, 171, 172, 173, 174, + 175, 176, 176, 177, 177, 178, 179, 181, 180, 183, + 182, 184, 184, 184, 184, 184, 184, 186, 185, 187, + 187, 187, 189, 188, 190, 190, 190, 192, 191, 193, + 193, 193, 194, 194, 195, 195, 196, 197, 198, 199, + 199, 200, 201, 201, 202, 202, 203, 203, 203, 204, + 204, 205, 205, 206, 206, 207, 207, 207, 208, 208, + 209 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -858,223 +864,222 @@ static const unsigned char yyr2[] = 1, 1, 1, 1, 1, 4, 5, 0, 7, 1, 6, 2, 0, 6, 1, 6, 5, 6, 0, 6, 1, 2, 0, 5, 0, 6, 1, 2, 3, 4, - 0, 7, 5, 5, 8, 8, 2, 7, 7, 7, - 7, 3, 8, 8, 4, 9, 9, 0, 6, 0, - 6, 0, 6, 1, 6, 5, 7, 7, 5, 5, - 5, 5, 5, 5, 5, 6, 5, 2, 2, 2, - 2, 1, 1, 2, 0, 5, 1, 2, 2, 2, - 2, 2, 2, 2, 6, 4, 4, 4, 7, 6, - 4, 4, 1, 16, 0, 5, 1, 2, 2, 2, - 2, 5, 4, 5, 4, 1, 9, 9, 1, 6, - 4, 11, 12, 0, 6, 0, 6, 0, 6, 0, - 6, 0, 6, 0, 6, 0, 6, 1, 5, 5, - 1, 0, 7, 5, 5, 5, 2, 5, 5, 5, - 6, 1, 5, 5, 5, 2, 5, 5, 5, 5, - 5, 5, 2, 5, 6, 1, 5, 5, 5, 2, - 5, 5, 5, 5, 5, 6, 1, 1, 1, 3, - 8, 8, 4, 9, 9, 1, 8, 2, 1, 1, - 1, 5, 1, 2, 1, 1, 0, 6, 0, 6, - 1, 2, 2, 2, 2, 2, 0, 6, 1, 6, - 5, 0, 6, 1, 6, 5, 0, 6, 1, 6, - 2, 1, 2, 1, 2, 1, 1, 1, 1, 1, + 0, 7, 5, 5, 8, 8, 2, 3, 7, 7, + 7, 8, 7, 8, 3, 8, 8, 4, 9, 9, + 0, 6, 0, 6, 0, 6, 1, 6, 5, 7, + 7, 5, 5, 5, 5, 5, 5, 5, 6, 5, + 2, 2, 2, 2, 1, 1, 2, 0, 5, 1, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 5, 6, 4, 4, 4, 4, 7, 5, + 6, 4, 4, 1, 16, 4, 1, 16, 9, 1, + 6, 4, 11, 12, 0, 6, 0, 6, 0, 6, + 0, 6, 0, 6, 0, 6, 0, 6, 1, 5, + 5, 1, 0, 7, 5, 5, 5, 2, 5, 5, + 5, 6, 1, 5, 5, 5, 2, 5, 5, 5, + 5, 5, 5, 2, 5, 6, 1, 5, 5, 5, + 2, 5, 5, 5, 5, 5, 6, 1, 1, 1, + 3, 8, 8, 4, 9, 9, 1, 8, 2, 1, + 1, 1, 5, 1, 2, 1, 1, 0, 6, 0, + 6, 1, 2, 2, 2, 2, 2, 0, 6, 1, + 6, 5, 0, 6, 1, 6, 5, 0, 6, 1, + 6, 2, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 1, 1, 1, 1, 1, 1, 1, 0 + 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, + 0 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state STATE-NUM when YYTABLE doesn't specify something else to do. Zero means the default is an error. */ -static const unsigned short yydefact[] = +static const unsigned short int yydefact[] = { - 0, 259, 259, 259, 259, 0, 2, 6, 3, 73, - 4, 29, 5, 150, 1, 245, 246, 247, 259, 0, - 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, - 259, 259, 259, 259, 259, 7, 8, 9, 10, 11, + 0, 260, 260, 260, 260, 0, 2, 6, 3, 76, + 4, 29, 5, 151, 1, 246, 247, 248, 260, 0, + 260, 260, 260, 260, 260, 260, 260, 260, 260, 260, + 260, 260, 260, 260, 260, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - 22, 23, 24, 0, 0, 0, 259, 0, 0, 0, - 0, 259, 0, 0, 259, 0, 94, 0, 90, 87, - 88, 89, 259, 114, 31, 0, 0, 0, 0, 0, - 259, 0, 0, 0, 156, 0, 240, 244, 243, 259, - 0, 67, 69, 71, 141, 0, 239, 238, 145, 143, - 139, 133, 206, 0, 135, 137, 38, 259, 0, 0, - 0, 0, 0, 0, 259, 0, 0, 0, 0, 0, - 0, 259, 0, 0, 0, 257, 258, 0, 259, 0, - 0, 0, 259, 259, 259, 259, 0, 242, 241, 259, - 0, 0, 0, 0, 32, 0, 0, 0, 0, 0, - 259, 0, 0, 0, 0, 0, 252, 253, 0, 0, + 22, 23, 24, 0, 0, 0, 260, 0, 0, 0, + 0, 260, 0, 0, 260, 0, 97, 0, 93, 90, + 91, 92, 260, 31, 0, 0, 0, 0, 0, 260, + 0, 0, 0, 157, 0, 241, 245, 244, 260, 0, + 70, 72, 74, 142, 0, 240, 239, 146, 144, 140, + 134, 207, 0, 136, 138, 38, 260, 0, 0, 0, + 0, 0, 0, 260, 0, 0, 0, 0, 0, 0, + 260, 0, 0, 258, 259, 0, 260, 0, 0, 0, + 260, 260, 260, 260, 0, 243, 242, 260, 0, 0, + 0, 0, 32, 0, 0, 0, 0, 0, 260, 0, + 0, 0, 0, 0, 253, 254, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 260, 0, + 260, 260, 232, 0, 0, 196, 152, 0, 189, 237, + 0, 0, 0, 0, 0, 0, 188, 0, 187, 236, + 0, 251, 0, 250, 249, 25, 0, 260, 260, 260, + 260, 260, 260, 260, 260, 260, 260, 27, 260, 260, + 260, 260, 78, 0, 260, 94, 84, 83, 82, 81, + 87, 86, 255, 256, 257, 0, 85, 0, 131, 0, + 89, 0, 99, 0, 233, 129, 0, 160, 260, 156, + 0, 158, 0, 0, 159, 0, 0, 155, 154, 0, + 26, 252, 36, 0, 0, 0, 0, 0, 34, 0, + 176, 0, 162, 0, 0, 0, 211, 260, 0, 0, + 0, 40, 0, 0, 0, 95, 77, 0, 88, 0, + 0, 0, 0, 0, 0, 0, 0, 98, 100, 101, + 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, + 0, 260, 30, 0, 148, 0, 0, 190, 0, 0, + 0, 161, 260, 71, 73, 75, 143, 260, 33, 0, + 0, 0, 0, 0, 0, 260, 0, 0, 147, 180, + 0, 0, 0, 0, 0, 260, 0, 0, 0, 0, + 0, 145, 173, 166, 141, 135, 260, 260, 260, 260, + 208, 212, 213, 214, 215, 216, 0, 137, 139, 42, + 39, 41, 37, 79, 80, 96, 0, 260, 260, 0, + 0, 0, 0, 0, 0, 260, 0, 0, 0, 153, + 0, 0, 0, 0, 193, 0, 238, 0, 0, 260, + 260, 0, 0, 0, 0, 260, 260, 0, 260, 0, + 0, 0, 0, 260, 260, 260, 260, 260, 209, 217, + 222, 227, 28, 0, 44, 0, 0, 0, 0, 123, + 0, 0, 126, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 259, 0, 259, 259, 231, 0, 259, 0, 195, 151, - 0, 188, 236, 0, 0, 0, 0, 0, 0, 187, - 0, 186, 235, 0, 250, 0, 249, 248, 25, 0, - 259, 259, 259, 259, 259, 259, 259, 259, 259, 259, - 27, 259, 259, 259, 259, 75, 0, 259, 91, 81, - 80, 79, 78, 84, 83, 254, 255, 256, 0, 82, - 0, 130, 0, 86, 0, 96, 0, 232, 128, 0, - 0, 116, 159, 259, 155, 0, 157, 0, 0, 158, - 0, 0, 154, 153, 0, 26, 251, 36, 0, 0, - 0, 0, 0, 34, 0, 175, 0, 161, 0, 0, - 0, 210, 259, 0, 0, 0, 40, 0, 0, 0, - 92, 74, 0, 85, 0, 0, 0, 0, 0, 0, - 0, 95, 97, 98, 99, 100, 101, 102, 103, 0, - 259, 30, 0, 0, 0, 0, 115, 118, 119, 120, - 117, 0, 147, 0, 0, 189, 0, 0, 0, 160, - 259, 68, 70, 72, 142, 259, 33, 0, 0, 0, - 0, 0, 0, 259, 0, 0, 146, 179, 0, 0, - 0, 0, 0, 259, 0, 0, 0, 0, 0, 144, - 172, 165, 140, 134, 259, 259, 259, 259, 207, 211, - 212, 213, 214, 215, 0, 136, 138, 42, 39, 41, - 37, 76, 77, 93, 0, 259, 0, 0, 0, 0, - 0, 0, 259, 0, 259, 0, 0, 0, 0, 0, - 152, 0, 0, 0, 0, 192, 0, 237, 0, 0, - 259, 259, 0, 0, 0, 0, 259, 259, 0, 259, - 0, 0, 0, 0, 259, 259, 259, 259, 259, 208, - 216, 221, 226, 28, 0, 44, 0, 0, 0, 0, - 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 125, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 205, 233, 0, 0, 0, - 204, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 200, 0, 198, 0, 199, - 0, 0, 0, 0, 0, 0, 0, 0, 111, 0, - 0, 105, 106, 107, 110, 0, 0, 0, 0, 124, - 0, 122, 0, 0, 0, 0, 0, 0, 0, 0, - 196, 0, 182, 184, 234, 178, 180, 183, 181, 0, - 177, 176, 168, 164, 166, 169, 197, 167, 0, 163, - 162, 0, 173, 170, 171, 259, 259, 259, 259, 0, - 46, 0, 0, 0, 0, 0, 0, 0, 127, 129, - 0, 123, 121, 148, 149, 0, 0, 0, 0, 35, - 185, 174, 259, 0, 0, 218, 0, 223, 0, 228, - 0, 0, 0, 259, 43, 47, 0, 0, 0, 0, - 0, 109, 104, 0, 191, 190, 0, 0, 0, 202, - 209, 259, 0, 217, 259, 0, 222, 259, 227, 230, - 0, 0, 0, 0, 0, 48, 45, 0, 0, 0, - 108, 0, 194, 193, 201, 203, 0, 259, 0, 259, - 0, 0, 0, 0, 0, 0, 0, 50, 49, 0, + 0, 206, 234, 0, 0, 0, 205, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 52, 0, 0, 53, 0, 0, 131, 0, 0, - 0, 0, 220, 0, 225, 0, 0, 0, 0, 0, - 61, 0, 0, 0, 0, 0, 132, 0, 0, 219, - 224, 229, 0, 0, 0, 0, 0, 0, 64, 0, - 0, 0, 51, 56, 0, 126, 55, 54, 0, 0, + 0, 201, 0, 199, 0, 200, 0, 0, 0, 0, + 0, 0, 0, 0, 122, 0, 125, 0, 114, 0, + 115, 116, 117, 121, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 197, 0, 183, 185, 235, 179, + 181, 184, 182, 0, 178, 177, 169, 165, 167, 170, + 198, 168, 0, 164, 163, 0, 174, 171, 172, 260, + 260, 260, 260, 0, 46, 0, 0, 0, 0, 0, + 0, 119, 0, 112, 0, 128, 130, 149, 150, 0, + 0, 0, 0, 35, 186, 175, 260, 0, 0, 219, + 0, 224, 0, 229, 0, 0, 0, 260, 43, 47, + 0, 0, 0, 0, 0, 0, 120, 113, 192, 191, + 0, 0, 0, 203, 210, 260, 0, 218, 260, 0, + 223, 260, 228, 231, 0, 0, 0, 0, 0, 48, + 45, 0, 0, 0, 0, 118, 195, 194, 202, 204, + 0, 260, 0, 260, 0, 0, 0, 0, 0, 0, + 0, 50, 49, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 52, 0, 0, 53, 0, + 0, 132, 0, 0, 0, 0, 221, 0, 226, 0, + 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, + 133, 0, 0, 220, 225, 230, 0, 0, 0, 0, + 0, 0, 67, 0, 0, 0, 51, 56, 0, 0, + 55, 54, 0, 0, 0, 0, 0, 0, 0, 0, + 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 63, 62, 0, 0, 0, - 0, 0, 0, 0, 66, 65, 58, 60, 59, 57, - 0, 0, 113 + 0, 0, 0, 66, 65, 0, 0, 0, 0, 0, + 0, 0, 0, 69, 68, 59, 62, 0, 60, 0, + 58, 0, 0, 63, 61, 0, 0, 124, 127 }; /* YYDEFGOTO[NTERM-NUM]. */ -static const short yydefgoto[] = +static const short int yydefgoto[] = { - -1, 5, 6, 68, 36, 37, 38, 272, 10, 39, - 204, 262, 40, 41, 153, 275, 369, 424, 485, 539, - 646, 664, 623, 625, 42, 140, 43, 141, 44, 142, - 8, 217, 279, 69, 120, 234, 292, 293, 294, 295, - 296, 297, 298, 428, 74, 123, 240, 307, 308, 309, - 310, 439, 70, 236, 71, 169, 45, 148, 46, 151, - 47, 152, 48, 147, 49, 143, 50, 146, 51, 145, - 311, 12, 243, 266, 264, 190, 188, 180, 183, 185, - 177, 84, 468, 476, 478, 474, 588, 459, 454, 52, - 149, 360, 480, 270, 361, 481, 564, 362, 482, 566, - 363, 483, 568, 173, 455, 191, 181, 396, 182, 85, - 136, 86, 96, 195, 196, 514, 228, 178, 97 + -1, 5, 6, 68, 36, 37, 38, 267, 10, 39, + 201, 257, 40, 41, 151, 270, 361, 413, 471, 523, + 630, 648, 607, 609, 42, 138, 43, 139, 44, 140, + 8, 214, 274, 69, 119, 231, 288, 289, 290, 291, + 292, 293, 294, 295, 296, 297, 298, 417, 299, 420, + 70, 233, 71, 167, 45, 146, 46, 149, 47, 150, + 48, 145, 49, 141, 50, 144, 51, 143, 303, 12, + 238, 261, 259, 187, 185, 177, 180, 182, 174, 83, + 454, 462, 464, 460, 572, 445, 440, 52, 147, 352, + 466, 265, 353, 467, 548, 354, 468, 550, 355, 469, + 552, 171, 441, 188, 178, 385, 179, 84, 134, 85, + 95, 192, 193, 498, 225, 175, 96 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -411 -static const short yypact[] = +#define YYPACT_NINF -402 +static const short int yypact[] = { - 197, -411, -411, -411, -411, 73, 1029, -411, 1151, -411, - 111, -411, 463, -411, -411, -411, -411, -411, 326, -85, - 326, 326, 326, 326, 326, 326, 326, 326, 326, 326, - 326, 326, 326, 326, 326, -411, -411, -411, -411, -411, - -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, - -411, -411, -411, 58, 52, 59, 326, 76, 107, 122, - 125, 326, 132, 136, 326, 139, -411, 144, -411, -411, - -411, -411, 326, -411, -411, 155, 110, 181, 184, 188, - 326, 190, 191, 209, -411, 211, -411, -411, -411, 326, - 213, -411, -411, -411, -411, 215, -411, -411, -411, -411, - -411, -411, -411, 217, -411, -411, -411, 326, 326, 266, - 221, 350, 363, 110, 326, 222, 110, 167, 224, 110, - 226, -411, 227, 230, 110, -411, -411, 232, 326, 266, - 266, 236, 326, 326, -411, 326, 109, -411, -411, 326, - 241, 242, 245, 265, -411, 267, 268, 270, 281, 293, - 326, 299, 300, 306, 307, 248, -411, -411, 266, 326, - 250, 252, 309, 310, 317, 318, 366, 320, 308, 322, - 326, 324, -411, 110, -411, 366, -411, 327, -411, -411, - 330, -411, -411, 24, 266, -16, 266, 366, 332, -411, - 334, -411, -411, 103, -411, 335, 326, -411, -411, 339, - -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, - -411, -411, -411, -411, 326, -411, 266, -411, -411, -411, - -411, -411, -411, -411, -411, -411, -411, -411, 341, -411, - 266, -411, 343, -411, 458, -411, 60, -411, -411, 348, - 185, -411, -411, -411, -411, 66, -411, 266, 74, -411, - 266, 362, -411, -411, 364, -411, -411, -411, 749, 930, - 1078, 207, -25, -411, 163, -411, 119, -411, 251, 253, - 63, -411, -411, 331, 410, 31, -411, 365, 368, 6, - -411, -411, 266, -411, 367, 373, 374, 375, 376, 378, - 380, -411, -411, -411, -411, -411, -411, -411, -411, 381, - 326, -411, 382, 383, 384, 385, -411, -411, -411, -411, - -411, 82, -411, 326, 386, -411, 326, 389, 266, -411, - 326, -411, -411, -411, -411, 326, -411, 390, 391, 393, - 395, 397, 398, 326, 401, 402, -411, -411, 404, 408, - 409, 412, 413, 326, 425, 427, 428, 429, 431, -411, - -411, -411, -411, -411, 326, 326, 326, 326, -411, -411, - -411, -411, -411, -411, 170, -411, -411, 110, -411, -411, - -411, -411, -411, -411, 100, 266, 266, 266, 266, 266, - 266, 266, 326, 432, 266, 266, 266, 266, 433, 434, - -411, 266, 266, 266, 266, -411, 435, -411, 437, 110, - -411, 326, 266, 110, 266, 438, 326, 326, 110, 326, - 266, 110, 266, 440, 326, 326, -411, -411, -411, -411, - -411, -411, -411, -411, 442, -411, 443, 208, 445, 266, - -411, 266, 446, 447, 448, 43, 266, 456, 366, 457, - 266, -411, 460, 266, 266, 266, 266, 266, 266, 266, - 266, 461, 366, 462, 464, 266, -411, 465, 40, 468, - -411, 29, 366, 469, 470, 471, 473, 44, 474, 110, - 64, 366, 476, 477, 17, -411, 478, 266, 479, 266, - 444, 481, 482, 483, 266, 484, 266, 486, -411, 266, - 266, -411, -411, -411, -411, 266, 266, 490, 491, -411, - 266, -411, 493, 494, 47, 97, 266, 266, 266, 266, - -411, 495, -411, -411, -411, -411, -411, -411, -411, 496, - -411, -411, -411, -411, -411, -411, -411, -411, 497, -411, - -411, 499, -411, -411, -411, -411, -411, -411, -411, 182, - 266, 266, 266, 266, 266, 266, 500, 501, -411, -411, - 266, -411, -411, -411, -411, 503, 504, 266, 266, -411, - -411, -411, -411, 94, 175, -411, 198, -411, 80, -411, - 77, 506, 507, 326, -411, 266, 249, 266, 266, 266, - 508, -411, -411, 266, -411, -411, 509, 510, 49, -411, - -411, 326, 516, -411, 326, 522, -411, 326, -411, -411, - 326, 523, 266, 266, 524, 266, -411, 525, 266, 266, - -411, 266, -411, -411, -411, -411, 527, -411, 528, -411, - 529, 266, 266, 81, 266, 108, 266, -411, -411, 532, - 534, 266, 266, 366, 48, 366, 53, 366, 266, 266, - 84, -411, 266, 87, -411, 266, 266, -411, 536, 266, - 266, 537, -411, 538, -411, 539, 266, 266, 326, 530, - -411, 326, 544, 266, 32, 266, -411, 266, 266, -411, - -411, -411, 546, 549, 266, 266, 266, 266, -411, 545, - 92, 551, -411, -411, 266, -411, -411, -411, 266, 266, - 266, 266, 266, 326, 553, 266, 266, 266, 266, 266, - 266, 266, 266, 266, 266, 266, 556, 557, 266, 266, - 266, 266, 266, 266, 266, -411, -411, 561, 562, 564, - 567, 568, 569, 266, -411, -411, -411, -411, -411, -411, - 266, 266, -411 + 187, -402, -402, -402, -402, 13, 999, -402, 1263, -402, + 115, -402, 255, -402, -402, -402, -402, -402, 286, -84, + 286, 286, 286, 286, 286, 286, 286, 286, 286, 286, + 286, 286, 286, 286, 286, -402, -402, -402, -402, -402, + -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, + -402, -402, -402, 90, -63, 22, 286, 42, 65, 81, + 120, 286, 138, 150, 286, 164, -402, 169, -402, -402, + -402, -402, 286, -402, 181, 192, 190, 191, 203, 286, + 205, 219, 224, -402, 227, -402, -402, -402, 286, 228, + -402, -402, -402, -402, 231, -402, -402, -402, -402, -402, + -402, -402, 232, -402, -402, -402, 286, 286, 213, 234, + 301, 326, 192, 286, 236, 192, 125, 241, 192, 242, + -402, 247, 192, -402, -402, 253, 286, 213, 213, 260, + 286, 286, -402, 286, 143, -402, -402, 286, 261, 262, + 263, 272, -402, 273, 275, 285, 288, 294, 286, 295, + 296, 299, 300, 208, -402, -402, 213, 286, 303, 304, + 305, 307, 309, 311, 332, 313, 302, 314, 286, 315, + -402, 192, -402, 332, 316, -402, -402, 317, -402, -402, + 6, 213, 14, 213, 332, 318, -402, 319, -402, -402, + 172, -402, 321, 286, -402, -402, 322, -402, -402, -402, + -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, + -402, 286, -402, 213, -402, -402, -402, -402, -402, -402, + -402, -402, -402, -402, -402, 325, -402, 213, -402, 328, + -402, 306, -402, 60, -402, -402, 329, -402, -402, -402, + 75, -402, 213, 80, -402, 213, 331, -402, -402, 327, + -402, -402, -402, 925, 1108, 1181, 373, 109, -402, 211, + -402, 146, -402, 397, 723, 121, -402, -402, 737, 796, + 144, -402, 334, 335, 51, -402, -402, 213, -402, 339, + 347, 350, 352, 353, 354, 356, 357, -402, -402, -402, + -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, + 359, 286, -402, 116, -402, 286, 360, -402, 286, 362, + 213, -402, 286, -402, -402, -402, -402, 286, -402, 367, + 368, 369, 370, 371, 372, 286, 376, 377, -402, -402, + 378, 381, 383, 384, 386, 286, 391, 392, 393, 396, + 405, -402, -402, -402, -402, -402, 286, 286, 286, 286, + -402, -402, -402, -402, -402, -402, 174, -402, -402, 192, + -402, -402, -402, -402, -402, -402, 100, 213, 213, 213, + 213, 213, 213, 213, 213, 286, 406, 407, 408, -402, + 213, 213, 213, 213, -402, 409, -402, 411, 192, -402, + 286, 213, 192, 213, 413, 286, 286, 192, 286, 213, + 192, 213, 414, 286, 286, -402, -402, -402, -402, -402, + -402, -402, -402, 415, -402, 416, 161, 417, 213, -402, + 418, 213, -402, 7, 419, 420, 422, 44, 213, 423, + 332, 213, 213, 213, 213, 213, 213, 424, 332, 425, + 426, 213, -402, 427, 24, 428, -402, 31, 332, 429, + 430, 431, 432, 34, 440, 192, 43, 332, 441, 442, + 71, -402, 443, 213, 444, 213, 446, 447, 448, 449, + 213, 450, 213, 453, -402, 213, -402, 213, -402, 213, + -402, -402, -402, -402, 56, 58, 454, 455, 55, 99, + 213, 213, 213, 213, -402, 457, -402, -402, -402, -402, + -402, -402, -402, 458, -402, -402, -402, -402, -402, -402, + -402, -402, 460, -402, -402, 463, -402, -402, -402, -402, + -402, -402, -402, 118, 213, 213, 213, 213, 213, 213, + 213, -402, 464, -402, 465, -402, -402, -402, -402, 466, + 467, 213, 213, -402, -402, -402, -402, 135, 72, -402, + 175, -402, 87, -402, 83, 470, 476, 286, -402, 213, + 209, 213, 213, 213, 213, 477, -402, -402, -402, -402, + 478, 479, 77, -402, -402, 286, 481, -402, 286, 484, + -402, 286, -402, -402, 286, 485, 213, 213, 486, 213, + -402, 487, 213, 213, 213, -402, -402, -402, -402, -402, + 489, -402, 492, -402, 493, 213, 213, 62, 213, 102, + 213, -402, -402, 494, 497, 213, 213, 332, 63, 332, + 66, 332, 213, 213, 86, -402, 213, 89, -402, 213, + 213, -402, 499, 213, 213, 500, -402, 504, -402, 505, + 213, 213, 286, 507, -402, 286, 508, 213, 47, 213, + -402, 213, 213, -402, -402, -402, 509, 510, 213, 213, + 213, 213, -402, 512, 92, 513, -402, 213, 213, 213, + -402, -402, 213, 213, 213, 213, 213, 286, 514, 213, + -402, 213, 213, 213, 213, 213, 213, 213, 213, 213, + 213, 213, 213, 516, 518, 213, 213, 213, 213, 213, + 213, 213, 213, -402, -402, 520, 521, 522, 68, 73, + 523, 213, 213, -402, -402, -402, -402, 527, -402, 528, + -402, 213, 213, -402, -402, 213, 213, -402, -402 }; /* YYPGOTO[NTERM-NUM]. */ -static const short yypgoto[] = +static const short int yypgoto[] = { - -411, -411, -411, 450, -411, -411, -411, -411, 254, -411, - -411, -411, -411, -411, -411, -411, -411, -411, -411, 50, - -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, - 206, -411, -411, -411, -411, -411, -411, -411, -411, -411, - -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, - -411, -411, -411, -411, -411, -411, -411, -411, -411, -411, - -411, -411, -411, -411, -411, -411, -411, -411, -263, -411, - -411, 231, -411, -411, -411, -195, -188, -172, -226, -252, - -206, -21, -411, -411, -411, -411, -411, -411, -411, -265, - -411, -411, -411, 20, 95, -411, -411, -411, -411, -411, - -411, -411, -411, 511, -410, -411, -411, 234, 14, 8, - -95, -411, -6, 492, -411, 1, -174, -51, 715 + -402, -402, -402, 482, -402, -402, -402, -402, 110, -402, + -402, -402, -402, -402, -402, -402, -402, -402, -402, -61, + -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, + 151, -402, -402, -9, -402, -402, -402, -402, -402, -402, + -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, + -402, -402, -402, -402, -402, -402, -402, -402, -402, -402, + -402, -402, -402, -402, -402, -402, -258, -402, -402, 112, + -402, -402, -402, -145, -139, -119, -279, -291, -263, 26, + -402, -402, -402, -402, -402, -402, -402, -261, -402, -402, + -402, -19, -44, -402, -402, -402, -402, -402, -402, -402, + -402, 436, -401, -402, -402, 170, 178, 9, -73, -402, + -6, 387, -402, 1, -165, -66, 713 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If @@ -1082,360 +1087,361 @@ static const short yypgoto[] = number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ #define YYTABLE_NINF -1 -static const unsigned short yytable[] = +static const unsigned short int yytable[] = { - 53, 239, 53, 350, 248, 359, 89, 477, 479, 15, - 16, 17, 87, 251, 87, 87, 87, 87, 87, 165, - 87, 87, 87, 87, 87, 127, 87, 87, 90, 91, - 92, 93, 94, 325, 98, 99, 100, 101, 102, 95, - 104, 105, 679, 245, 199, 103, 156, 157, 106, 248, - 87, 156, 157, 680, 531, 210, 156, 157, 87, 245, - 161, 163, 164, 245, 110, 167, 245, 326, 171, 15, - 16, 17, 118, 14, 354, 115, 249, 15, 16, 17, - 15, 16, 17, 137, 248, 107, 122, 15, 16, 17, - 15, 16, 17, 26, 131, 15, 16, 17, 372, 681, - 640, 87, 155, 156, 157, 354, 125, 126, 137, 532, - 158, 299, 367, 125, 126, 154, 246, 248, 300, 277, - 355, 518, 237, 368, 682, 388, 338, 30, 643, 194, - 184, 186, 516, 137, 389, 494, 524, 355, 597, 553, - 652, 614, 237, 108, 137, 654, 189, 192, 356, 357, - 109, 355, 461, 218, 254, 358, 527, 313, 30, 216, - 470, 339, 340, 26, 194, 316, 341, 111, 600, 72, - 327, 342, 598, 641, 390, 658, 458, 343, 661, 356, - 357, 426, 73, 693, 467, 247, 590, 250, 344, 554, - 256, 168, 345, 453, 505, 346, 328, 347, 112, 348, - 644, 198, 465, 83, 570, 329, 330, 634, 137, 636, - 331, 349, 464, 113, 75, 332, 114, 278, 463, 504, - 473, 333, 76, 116, 302, 571, 472, 117, 72, 457, - 119, 282, 334, 591, 572, 121, 335, 466, 303, 314, - 592, 73, 317, 337, 304, 351, 124, 83, 315, 77, - 78, 318, 53, 53, 53, 336, 594, 305, 75, 79, - 75, 573, 423, 595, 498, 80, 76, 593, 76, 156, - 157, 570, 128, 373, 574, 129, 81, 306, 511, 130, - 82, 132, 133, 374, 1, 2, 3, 4, 519, 487, - 596, 83, 571, 77, 78, 77, 78, 528, 359, 324, - 134, 572, 135, 79, 139, 79, 144, 391, 150, 80, - 393, 80, 159, 166, 383, 170, 425, 172, 175, 395, - 81, 176, 81, 179, 82, 615, 82, 187, 573, 15, - 16, 17, 200, 201, 397, 83, 202, 83, 75, 398, - 215, 606, 219, 352, 220, 353, 76, 405, 87, 87, - 87, 87, 460, 125, 126, 160, 203, 413, 205, 206, - 469, 207, 419, 420, 421, 422, 125, 126, 162, 225, - 226, 227, 208, 77, 78, 427, 429, 431, 432, 433, - 434, 435, 436, 79, 209, 440, 442, 443, 444, 80, - 211, 212, 447, 448, 449, 450, 397, 213, 214, 230, - 81, 221, 222, 184, 82, 186, 258, 259, 260, 223, - 224, 184, 229, 186, 231, 83, 233, 75, 526, 242, - 189, 192, 244, 365, 252, 76, 253, 255, 189, 192, - 489, 257, 490, 281, 261, 283, 495, 496, 268, 269, - 301, 500, 273, 274, 502, 503, 184, 186, 506, 507, - 508, 509, 77, 78, 319, 320, 35, 370, 375, 651, - 371, 653, 79, 655, 376, 377, 378, 379, 80, 380, - 75, 381, 382, 384, 385, 386, 387, 392, 76, 81, - 394, 399, 400, 82, 401, 540, 402, 542, 403, 404, - 544, 545, 406, 407, 83, 408, 546, 547, 284, 409, - 410, 550, 366, 411, 412, 77, 78, 555, 556, 557, - 558, 285, 286, 287, 288, 79, 414, 289, 415, 416, - 417, 80, 418, 438, 445, 446, 364, 451, 452, 462, - 290, 471, 81, 484, 486, 535, 82, 488, 491, 492, - 493, 575, 540, 577, 578, 579, 580, 83, 497, 499, - 291, 583, 501, 510, 512, 563, 513, 515, 586, 587, - 517, 520, 521, 522, 601, 523, 525, 87, 529, 530, - 533, 534, 536, 537, 538, 541, 605, 543, 607, 608, - 609, 604, 548, 549, 611, 551, 552, 559, 560, 561, - 562, 576, 581, 582, 621, 584, 585, 602, 603, 0, - 610, 612, 613, 624, 626, 616, 628, 617, 618, 630, - 631, 620, 632, 619, 622, 627, 437, 629, 633, 635, - 637, 675, 638, 639, 647, 642, 648, 645, 666, 669, - 670, 671, 649, 650, 659, 677, 692, 662, 686, 656, - 657, 687, 695, 660, 703, 193, 663, 665, 715, 716, - 667, 668, 674, 724, 725, 676, 726, 672, 673, 727, - 728, 729, 232, 599, 678, 0, 683, 0, 684, 685, - 0, 0, 0, 0, 694, 688, 689, 690, 691, 0, - 0, 0, 0, 0, 0, 696, 0, 702, 0, 697, - 698, 699, 700, 701, 0, 0, 704, 705, 706, 707, - 708, 709, 710, 711, 712, 713, 714, 0, 0, 717, - 718, 719, 720, 721, 722, 723, 7, 9, 11, 13, - 0, 0, 0, 0, 730, 0, 0, 0, 0, 0, - 0, 731, 732, 88, 0, 88, 88, 88, 88, 88, - 0, 88, 88, 88, 88, 88, 0, 88, 88, 0, - 0, 0, 15, 16, 17, 0, 0, 54, 55, 0, - 0, 0, 56, 18, 0, 19, 0, 57, 0, 0, - 0, 88, 58, 0, 0, 0, 20, 0, 21, 88, - 0, 22, 0, 0, 23, 24, 0, 25, 0, 0, - 59, 0, 0, 26, 27, 60, 0, 0, 28, 29, - 0, 0, 0, 0, 138, 0, 0, 61, 0, 0, - 0, 62, 63, 30, 0, 64, 0, 65, 31, 0, - 66, 0, 88, 32, 33, 0, 0, 0, 0, 138, - 0, 0, 34, 67, 0, 0, 174, 0, 0, 0, - 0, 321, 0, 0, 0, 0, 0, 0, 0, 174, - 197, 0, 0, 0, 138, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 138, 0, 0, 0, 0, + 53, 73, 53, 342, 351, 463, 465, 88, 236, 125, + 154, 155, 86, 14, 86, 86, 86, 86, 86, 246, + 86, 86, 86, 86, 86, 240, 86, 86, 107, 89, + 90, 91, 92, 93, 243, 97, 98, 99, 100, 101, + 163, 103, 104, 240, 159, 161, 162, 154, 155, 165, + 86, 243, 169, 240, 15, 16, 17, 663, 86, 154, + 155, 154, 155, 243, 196, 109, 154, 155, 664, 154, + 155, 154, 155, 117, 240, 207, 154, 155, 15, 16, + 17, 624, 135, 15, 16, 17, 15, 16, 17, 15, + 16, 17, 15, 16, 17, 15, 16, 17, 241, 478, + 86, 153, 447, 154, 155, 234, 244, 135, 515, 156, + 456, 300, 444, 108, 665, 152, 500, 106, 301, 243, + 453, 26, 627, 502, 234, 439, 508, 191, 181, 183, + 575, 135, 346, 110, 451, 511, 483, 576, 272, 666, + 554, 489, 135, 364, 347, 581, 346, 537, 531, 166, + 533, 215, 488, 330, 625, 636, 111, 213, 638, 377, + 716, 555, 191, 516, 577, 718, 305, 317, 378, 598, + 556, 308, 112, 72, 584, 123, 124, 642, 347, 582, + 645, 415, 242, 677, 245, 30, 66, 251, 331, 332, + 26, 538, 347, 333, 628, 123, 124, 557, 334, 30, + 618, 318, 620, 94, 335, 135, 348, 349, 379, 102, + 558, 113, 105, 350, 273, 336, 154, 155, 319, 337, + 348, 349, 338, 249, 339, 359, 340, 574, 277, 115, + 82, 554, 72, 578, 306, 195, 360, 309, 341, 114, + 579, 116, 473, 307, 320, 66, 310, 53, 53, 53, + 121, 450, 555, 321, 322, 118, 449, 129, 323, 459, + 120, 556, 74, 324, 458, 487, 412, 580, 365, 325, + 75, 443, 122, 495, 1, 2, 3, 4, 366, 452, + 326, 126, 127, 503, 327, 329, 351, 343, 557, 15, + 16, 17, 512, 414, 128, 82, 130, 76, 77, 380, + 212, 590, 382, 328, 123, 124, 158, 78, 186, 189, + 131, 384, 256, 79, 599, 132, 263, 264, 133, 137, + 268, 269, 142, 148, 80, 157, 446, 164, 81, 123, + 124, 160, 168, 170, 455, 222, 223, 224, 173, 82, + 86, 86, 86, 86, 176, 279, 280, 73, 253, 254, + 255, 184, 197, 198, 199, 408, 409, 410, 411, 281, + 282, 283, 284, 200, 202, 285, 203, 416, 418, 421, + 423, 424, 425, 426, 427, 428, 204, 356, 286, 205, + 74, 433, 434, 435, 436, 206, 208, 209, 75, 510, + 210, 211, 181, 227, 183, 216, 217, 218, 287, 219, + 181, 220, 183, 221, 74, 226, 228, 230, 237, 239, + 247, 248, 75, 250, 252, 76, 77, 276, 312, 475, + 278, 302, 477, 311, 479, 78, 362, 363, 484, 485, + 367, 79, 181, 183, 490, 491, 492, 493, 368, 76, + 77, 369, 80, 370, 371, 372, 81, 373, 374, 78, + 375, 381, 635, 383, 637, 79, 639, 82, 388, 389, + 390, 391, 392, 393, 560, 316, 80, 395, 396, 397, + 81, 524, 398, 526, 399, 400, 528, 401, 529, 376, + 530, 82, 403, 404, 405, 532, 534, 406, 35, 344, + 386, 539, 540, 541, 542, 387, 407, 430, 431, 432, + 547, 437, 438, 394, 448, 457, 470, 472, 583, 474, + 476, 480, 481, 402, 482, 486, 494, 496, 497, 499, + 501, 504, 505, 506, 507, 559, 524, 561, 562, 563, + 564, 565, 509, 513, 514, 517, 518, 519, 520, 521, + 522, 525, 570, 571, 527, 429, 535, 536, 585, 543, + 544, 86, 545, 386, 546, 229, 566, 567, 568, 569, + 589, 586, 591, 592, 593, 594, 588, 587, 190, 595, + 596, 597, 601, 186, 189, 603, 606, 611, 605, 613, + 617, 186, 189, 619, 621, 0, 631, 608, 610, 632, + 612, 650, 653, 614, 615, 616, 654, 655, 659, 661, + 0, 670, 671, 676, 679, 689, 622, 623, 703, 626, + 704, 629, 713, 714, 715, 720, 633, 634, 643, 723, + 724, 646, 0, 640, 641, 0, 0, 644, 0, 0, + 647, 649, 0, 0, 651, 652, 658, 0, 0, 660, + 0, 656, 657, 0, 0, 0, 0, 0, 662, 0, + 667, 0, 668, 669, 0, 0, 0, 0, 678, 672, + 673, 674, 675, 0, 0, 0, 0, 0, 680, 681, + 682, 688, 0, 683, 684, 685, 686, 687, 0, 0, + 690, 0, 691, 692, 693, 694, 695, 696, 697, 698, + 699, 700, 701, 702, 0, 0, 705, 706, 707, 708, + 709, 710, 711, 712, 0, 0, 0, 0, 0, 717, + 719, 0, 721, 722, 7, 9, 11, 13, 0, 0, + 0, 0, 725, 726, 0, 0, 727, 728, 0, 0, + 74, 87, 0, 87, 87, 87, 87, 87, 75, 87, + 87, 87, 87, 87, 74, 87, 87, 0, 0, 0, + 0, 0, 75, 600, 0, 0, 602, 0, 0, 604, + 0, 0, 0, 0, 0, 76, 77, 0, 0, 87, + 0, 0, 0, 0, 0, 78, 0, 87, 0, 76, + 77, 79, 0, 0, 0, 0, 0, 0, 0, 78, + 0, 0, 80, 0, 0, 79, 81, 0, 0, 0, + 0, 136, 0, 74, 0, 0, 80, 82, 0, 0, + 81, 75, 0, 0, 0, 345, 0, 0, 0, 87, + 0, 82, 0, 0, 0, 0, 136, 0, 0, 357, + 0, 0, 0, 172, 0, 0, 0, 0, 76, 77, + 0, 0, 0, 0, 0, 172, 194, 0, 78, 0, + 136, 0, 0, 0, 79, 0, 0, 0, 0, 0, + 0, 136, 0, 0, 0, 80, 0, 0, 0, 81, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 197, 0, 235, 238, 0, - 0, 241, 0, 0, 0, 0, 0, 0, 0, 0, + 82, 194, 0, 232, 235, 0, 0, 0, 358, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 9, 9, 9, 13, 263, - 265, 267, 13, 13, 271, 0, 13, 13, 276, 138, - 0, 0, 280, 15, 16, 17, 0, 0, 54, 55, - 0, 0, 0, 56, 18, 0, 19, 0, 57, 0, - 0, 0, 0, 58, 0, 0, 0, 20, 312, 21, - 0, 0, 22, 0, 0, 23, 24, 0, 25, 0, - 0, 59, 0, 0, 26, 27, 60, 0, 0, 28, - 29, 0, 0, 0, 0, 0, 0, 11, 61, 0, - 0, 0, 62, 63, 30, 0, 64, 0, 65, 31, - 0, 66, 0, 0, 32, 33, 0, 0, 0, 0, - 0, 0, 0, 34, 67, 0, 0, 0, 0, 0, - 0, 0, 322, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 15, 16, 17, 0, 0, 0, 0, 0, - 0, 0, 0, 18, 0, 19, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 9, 9, 9, 13, 258, 260, 262, 13, 13, 266, + 0, 13, 13, 271, 136, 0, 0, 275, 15, 16, + 17, 0, 0, 54, 55, 0, 0, 0, 56, 18, + 0, 19, 0, 57, 0, 0, 0, 0, 58, 0, + 0, 304, 20, 0, 21, 0, 0, 22, 0, 0, + 23, 24, 0, 25, 0, 0, 59, 0, 0, 26, + 27, 60, 0, 0, 28, 29, 0, 0, 0, 0, + 11, 0, 0, 61, 0, 0, 0, 62, 63, 30, + 0, 64, 0, 65, 31, 0, 66, 0, 0, 32, + 33, 0, 15, 16, 17, 0, 0, 0, 34, 67, + 0, 0, 0, 18, 0, 19, 0, 313, 0, 0, 0, 0, 0, 0, 0, 0, 20, 0, 21, 0, - 0, 22, 0, 0, 23, 24, 0, 25, 0, 88, - 88, 88, 88, 26, 27, 0, 0, 0, 28, 29, - 0, 15, 16, 17, 0, 0, 54, 55, 0, 0, - 430, 56, 18, 30, 19, 0, 57, 0, 31, 441, - 0, 58, 0, 32, 33, 20, 0, 21, 0, 0, - 22, 0, 34, 23, 24, 456, 25, 0, 0, 59, + 0, 22, 0, 0, 23, 24, 0, 25, 0, 0, + 0, 0, 0, 26, 27, 0, 0, 0, 28, 29, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 87, + 87, 87, 87, 30, 0, 0, 0, 0, 31, 0, + 0, 0, 0, 32, 33, 0, 0, 0, 0, 0, + 419, 422, 34, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 442, 0, 0, 0, 0, 0, 0, 0, + 0, 15, 16, 17, 0, 0, 54, 55, 461, 442, + 442, 56, 18, 0, 19, 0, 57, 0, 0, 0, + 0, 58, 0, 0, 0, 20, 0, 21, 0, 0, + 22, 0, 0, 23, 24, 0, 25, 0, 0, 59, 0, 0, 26, 27, 60, 0, 0, 28, 29, 0, - 0, 475, 456, 456, 0, 0, 61, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 61, 0, 0, 0, 62, 63, 30, 0, 64, 0, 65, 31, 0, 66, 0, 0, 32, 33, 15, 16, 17, 0, 0, 54, 55, 34, 67, 0, 56, 18, 0, 19, 0, 57, - 323, 0, 0, 0, 58, 0, 0, 0, 20, 0, + 314, 0, 0, 0, 58, 0, 0, 0, 20, 0, 21, 0, 0, 22, 0, 0, 23, 24, 0, 25, 0, 0, 59, 0, 0, 26, 27, 60, 0, 0, - 28, 29, 0, 0, 0, 0, 0, 0, 0, 61, + 28, 29, 266, 549, 551, 553, 0, 0, 0, 61, 0, 0, 0, 62, 63, 30, 0, 64, 0, 65, - 31, 0, 66, 0, 0, 32, 33, 0, 0, 0, - 0, 0, 0, 0, 34, 67, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 271, 565, 567, 569, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 589, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 88, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 456, 0, 456 + 31, 0, 66, 0, 0, 32, 33, 0, 0, 573, + 0, 0, 0, 0, 34, 67, 15, 16, 17, 0, + 87, 54, 55, 315, 0, 0, 56, 18, 0, 19, + 0, 57, 0, 0, 0, 0, 58, 0, 0, 0, + 20, 0, 21, 0, 0, 22, 0, 0, 23, 24, + 0, 25, 0, 0, 59, 0, 0, 26, 27, 60, + 0, 0, 28, 29, 442, 0, 442, 0, 0, 0, + 0, 61, 0, 0, 0, 62, 63, 30, 0, 64, + 0, 65, 31, 0, 66, 0, 0, 32, 33, 0, + 0, 0, 0, 0, 0, 0, 34, 67 }; -static const short yycheck[] = +static const short int yycheck[] = { - 6, 175, 8, 266, 20, 270, 91, 417, 418, 3, - 4, 5, 18, 187, 20, 21, 22, 23, 24, 114, - 26, 27, 28, 29, 30, 76, 32, 33, 20, 21, - 22, 23, 24, 58, 26, 27, 28, 29, 30, 25, - 32, 33, 10, 19, 139, 31, 3, 4, 34, 20, - 56, 3, 4, 21, 37, 150, 3, 4, 64, 19, - 111, 112, 113, 19, 56, 116, 19, 92, 119, 3, - 4, 5, 64, 0, 11, 61, 92, 3, 4, 5, - 3, 4, 5, 89, 20, 27, 72, 3, 4, 5, - 3, 4, 5, 44, 80, 3, 4, 5, 92, 67, - 19, 107, 108, 3, 4, 11, 3, 4, 114, 92, - 109, 51, 81, 3, 4, 107, 92, 20, 58, 214, - 57, 92, 173, 92, 92, 43, 7, 64, 20, 135, - 129, 130, 92, 139, 52, 92, 92, 57, 58, 92, - 92, 92, 193, 91, 150, 92, 132, 133, 85, 86, - 91, 57, 404, 159, 51, 92, 92, 91, 64, 158, - 412, 42, 43, 44, 170, 91, 47, 91, 91, 58, - 7, 52, 92, 92, 92, 91, 402, 58, 91, 85, - 86, 81, 71, 91, 410, 184, 92, 186, 69, 92, - 196, 24, 73, 399, 446, 76, 33, 78, 91, 80, - 92, 92, 408, 84, 22, 42, 43, 617, 214, 619, - 47, 92, 407, 91, 7, 52, 91, 216, 406, 445, - 415, 58, 15, 91, 39, 43, 414, 91, 58, 401, - 91, 230, 69, 58, 52, 91, 73, 409, 53, 245, - 65, 71, 248, 264, 59, 266, 91, 84, 247, 42, - 43, 250, 258, 259, 260, 92, 58, 72, 7, 52, - 7, 79, 92, 65, 438, 58, 15, 92, 15, 3, - 4, 22, 91, 279, 92, 91, 69, 92, 452, 91, - 73, 91, 91, 282, 87, 88, 89, 90, 462, 81, - 92, 84, 43, 42, 43, 42, 43, 471, 563, 92, - 91, 52, 91, 52, 91, 52, 91, 313, 91, 58, - 316, 58, 91, 91, 300, 91, 367, 91, 91, 318, - 69, 91, 69, 91, 73, 588, 73, 91, 79, 3, - 4, 5, 91, 91, 320, 84, 91, 84, 7, 325, - 92, 92, 92, 92, 92, 92, 15, 333, 354, 355, - 356, 357, 403, 3, 4, 5, 91, 343, 91, 91, - 411, 91, 354, 355, 356, 357, 3, 4, 5, 3, - 4, 5, 91, 42, 43, 374, 375, 376, 377, 378, - 379, 380, 381, 52, 91, 384, 385, 386, 387, 58, - 91, 91, 391, 392, 393, 394, 382, 91, 91, 91, - 69, 92, 92, 402, 73, 404, 200, 201, 202, 92, - 92, 410, 92, 412, 92, 84, 92, 7, 469, 92, - 406, 407, 92, 92, 92, 15, 92, 92, 414, 415, - 429, 92, 431, 92, 203, 92, 435, 436, 207, 208, - 92, 440, 211, 212, 443, 444, 445, 446, 447, 448, - 449, 450, 42, 43, 92, 91, 6, 92, 91, 633, - 92, 635, 52, 637, 91, 91, 91, 91, 58, 91, - 7, 91, 91, 91, 91, 91, 91, 91, 15, 69, - 91, 91, 91, 73, 91, 484, 91, 486, 91, 91, - 489, 490, 91, 91, 84, 91, 495, 496, 40, 91, - 91, 500, 92, 91, 91, 42, 43, 506, 507, 508, - 509, 53, 54, 55, 56, 52, 91, 59, 91, 91, - 91, 58, 91, 91, 91, 91, 272, 92, 91, 91, - 72, 91, 69, 91, 91, 91, 73, 92, 92, 92, - 92, 540, 541, 542, 543, 544, 545, 84, 92, 92, - 92, 550, 92, 92, 92, 535, 92, 92, 557, 558, - 92, 92, 92, 92, 570, 92, 92, 573, 92, 92, - 92, 92, 91, 91, 91, 91, 575, 91, 577, 578, - 579, 573, 92, 92, 583, 92, 92, 92, 92, 92, - 91, 541, 92, 92, 600, 92, 92, 91, 91, -1, - 92, 92, 92, 602, 603, 591, 605, 91, 594, 608, - 609, 597, 611, 91, 91, 91, 382, 92, 91, 91, - 91, 91, 621, 622, 92, 624, 92, 626, 92, 92, - 92, 92, 631, 632, 640, 91, 91, 643, 92, 638, - 639, 92, 91, 642, 91, 134, 645, 646, 92, 92, - 649, 650, 658, 92, 92, 661, 92, 656, 657, 92, - 92, 92, 170, 568, 663, -1, 665, -1, 667, 668, - -1, -1, -1, -1, 680, 674, 675, 676, 677, -1, - -1, -1, -1, -1, -1, 684, -1, 693, -1, 688, + 6, 10, 8, 261, 265, 406, 407, 91, 173, 75, + 3, 4, 18, 0, 20, 21, 22, 23, 24, 184, + 26, 27, 28, 29, 30, 19, 32, 33, 91, 20, + 21, 22, 23, 24, 20, 26, 27, 28, 29, 30, + 113, 32, 33, 19, 110, 111, 112, 3, 4, 115, + 56, 20, 118, 19, 3, 4, 5, 10, 64, 3, + 4, 3, 4, 20, 137, 56, 3, 4, 21, 3, + 4, 3, 4, 64, 19, 148, 3, 4, 3, 4, + 5, 19, 88, 3, 4, 5, 3, 4, 5, 3, + 4, 5, 3, 4, 5, 3, 4, 5, 92, 92, + 106, 107, 393, 3, 4, 171, 92, 113, 37, 108, + 401, 51, 391, 91, 67, 106, 92, 27, 58, 20, + 399, 44, 20, 92, 190, 388, 92, 133, 127, 128, + 58, 137, 11, 91, 397, 92, 92, 65, 211, 92, + 22, 432, 148, 92, 57, 58, 11, 92, 92, 24, + 92, 157, 431, 7, 92, 92, 91, 156, 92, 43, + 92, 43, 168, 92, 92, 92, 91, 58, 52, 92, + 52, 91, 91, 58, 91, 3, 4, 91, 57, 92, + 91, 81, 181, 91, 183, 64, 71, 193, 42, 43, + 44, 92, 57, 47, 92, 3, 4, 79, 52, 64, + 601, 92, 603, 25, 58, 211, 85, 86, 92, 31, + 92, 91, 34, 92, 213, 69, 3, 4, 7, 73, + 85, 86, 76, 51, 78, 81, 80, 92, 227, 91, + 84, 22, 58, 58, 240, 92, 92, 243, 92, 61, + 65, 91, 81, 242, 33, 71, 245, 253, 254, 255, + 72, 396, 43, 42, 43, 91, 395, 79, 47, 404, + 91, 52, 7, 52, 403, 430, 92, 92, 274, 58, + 15, 390, 91, 438, 87, 88, 89, 90, 277, 398, + 69, 91, 91, 448, 73, 259, 547, 261, 79, 3, + 4, 5, 457, 359, 91, 84, 91, 42, 43, 305, + 92, 92, 308, 92, 3, 4, 5, 52, 130, 131, + 91, 310, 200, 58, 572, 91, 204, 205, 91, 91, + 208, 209, 91, 91, 69, 91, 392, 91, 73, 3, + 4, 5, 91, 91, 400, 3, 4, 5, 91, 84, + 346, 347, 348, 349, 91, 39, 40, 356, 197, 198, + 199, 91, 91, 91, 91, 346, 347, 348, 349, 53, + 54, 55, 56, 91, 91, 59, 91, 366, 367, 368, + 369, 370, 371, 372, 373, 374, 91, 267, 72, 91, + 7, 380, 381, 382, 383, 91, 91, 91, 15, 455, + 91, 91, 391, 91, 393, 92, 92, 92, 92, 92, + 399, 92, 401, 92, 7, 92, 92, 92, 92, 92, + 92, 92, 15, 92, 92, 42, 43, 92, 91, 418, + 92, 92, 421, 92, 423, 52, 92, 92, 427, 428, + 91, 58, 431, 432, 433, 434, 435, 436, 91, 42, + 43, 91, 69, 91, 91, 91, 73, 91, 91, 52, + 91, 91, 617, 91, 619, 58, 621, 84, 91, 91, + 91, 91, 91, 91, 525, 92, 69, 91, 91, 91, + 73, 470, 91, 472, 91, 91, 475, 91, 477, 301, + 479, 84, 91, 91, 91, 484, 485, 91, 6, 92, + 312, 490, 491, 492, 493, 317, 91, 91, 91, 91, + 519, 92, 91, 325, 91, 91, 91, 91, 552, 92, + 92, 92, 92, 335, 92, 92, 92, 92, 92, 92, + 92, 92, 92, 92, 92, 524, 525, 526, 527, 528, + 529, 530, 92, 92, 92, 92, 92, 91, 91, 91, + 91, 91, 541, 542, 91, 375, 92, 92, 554, 92, + 92, 557, 92, 375, 91, 168, 92, 92, 92, 92, + 559, 91, 561, 562, 563, 564, 557, 91, 132, 92, + 92, 92, 91, 395, 396, 91, 91, 91, 584, 92, + 91, 403, 404, 91, 91, -1, 92, 586, 587, 92, + 589, 92, 92, 592, 593, 594, 92, 92, 91, 91, + -1, 92, 92, 91, 91, 91, 605, 606, 92, 608, + 92, 610, 92, 92, 92, 92, 615, 616, 624, 92, + 92, 627, -1, 622, 623, -1, -1, 626, -1, -1, + 629, 630, -1, -1, 633, 634, 642, -1, -1, 645, + -1, 640, 641, -1, -1, -1, -1, -1, 647, -1, + 649, -1, 651, 652, -1, -1, -1, -1, 664, 658, + 659, 660, 661, -1, -1, -1, -1, -1, 667, 668, + 669, 677, -1, 672, 673, 674, 675, 676, -1, -1, + 679, -1, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, -1, -1, 695, 696, 697, 698, - 699, 700, 701, 702, 703, 704, 705, -1, -1, 708, - 709, 710, 711, 712, 713, 714, 1, 2, 3, 4, - -1, -1, -1, -1, 723, -1, -1, -1, -1, -1, - -1, 730, 731, 18, -1, 20, 21, 22, 23, 24, - -1, 26, 27, 28, 29, 30, -1, 32, 33, -1, - -1, -1, 3, 4, 5, -1, -1, 8, 9, -1, - -1, -1, 13, 14, -1, 16, -1, 18, -1, -1, - -1, 56, 23, -1, -1, -1, 27, -1, 29, 64, - -1, 32, -1, -1, 35, 36, -1, 38, -1, -1, - 41, -1, -1, 44, 45, 46, -1, -1, 49, 50, - -1, -1, -1, -1, 89, -1, -1, 58, -1, -1, - -1, 62, 63, 64, -1, 66, -1, 68, 69, -1, - 71, -1, 107, 74, 75, -1, -1, -1, -1, 114, - -1, -1, 83, 84, -1, -1, 121, -1, -1, -1, - -1, 92, -1, -1, -1, -1, -1, -1, -1, 134, - 135, -1, -1, -1, 139, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 150, -1, -1, -1, -1, + 699, 700, 701, 702, -1, -1, -1, -1, -1, 708, + 709, -1, 711, 712, 1, 2, 3, 4, -1, -1, + -1, -1, 721, 722, -1, -1, 725, 726, -1, -1, + 7, 18, -1, 20, 21, 22, 23, 24, 15, 26, + 27, 28, 29, 30, 7, 32, 33, -1, -1, -1, + -1, -1, 15, 575, -1, -1, 578, -1, -1, 581, + -1, -1, -1, -1, -1, 42, 43, -1, -1, 56, + -1, -1, -1, -1, -1, 52, -1, 64, -1, 42, + 43, 58, -1, -1, -1, -1, -1, -1, -1, 52, + -1, -1, 69, -1, -1, 58, 73, -1, -1, -1, + -1, 88, -1, 7, -1, -1, 69, 84, -1, -1, + 73, 15, -1, -1, -1, 92, -1, -1, -1, 106, + -1, 84, -1, -1, -1, -1, 113, -1, -1, 92, + -1, -1, -1, 120, -1, -1, -1, -1, 42, 43, + -1, -1, -1, -1, -1, 132, 133, -1, 52, -1, + 137, -1, -1, -1, 58, -1, -1, -1, -1, -1, + -1, 148, -1, -1, -1, 69, -1, -1, -1, 73, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 170, -1, 172, 173, -1, - -1, 176, -1, -1, -1, -1, -1, -1, -1, -1, + 84, 168, -1, 170, 171, -1, -1, -1, 92, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 200, 201, 202, 203, 204, - 205, 206, 207, 208, 209, -1, 211, 212, 213, 214, - -1, -1, 217, 3, 4, 5, -1, -1, 8, 9, - -1, -1, -1, 13, 14, -1, 16, -1, 18, -1, - -1, -1, -1, 23, -1, -1, -1, 27, 243, 29, - -1, -1, 32, -1, -1, 35, 36, -1, 38, -1, - -1, 41, -1, -1, 44, 45, 46, -1, -1, 49, - 50, -1, -1, -1, -1, -1, -1, 272, 58, -1, - -1, -1, 62, 63, 64, -1, 66, -1, 68, 69, - -1, 71, -1, -1, 74, 75, -1, -1, -1, -1, - -1, -1, -1, 83, 84, -1, -1, -1, -1, -1, - -1, -1, 92, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 3, 4, 5, -1, -1, -1, -1, -1, - -1, -1, -1, 14, -1, 16, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, + -1, 208, 209, 210, 211, -1, -1, 214, 3, 4, + 5, -1, -1, 8, 9, -1, -1, -1, 13, 14, + -1, 16, -1, 18, -1, -1, -1, -1, 23, -1, + -1, 238, 27, -1, 29, -1, -1, 32, -1, -1, + 35, 36, -1, 38, -1, -1, 41, -1, -1, 44, + 45, 46, -1, -1, 49, 50, -1, -1, -1, -1, + 267, -1, -1, 58, -1, -1, -1, 62, 63, 64, + -1, 66, -1, 68, 69, -1, 71, -1, -1, 74, + 75, -1, 3, 4, 5, -1, -1, -1, 83, 84, + -1, -1, -1, 14, -1, 16, -1, 92, -1, -1, -1, -1, -1, -1, -1, -1, 27, -1, 29, -1, - -1, 32, -1, -1, 35, 36, -1, 38, -1, 354, - 355, 356, 357, 44, 45, -1, -1, -1, 49, 50, - -1, 3, 4, 5, -1, -1, 8, 9, -1, -1, - 375, 13, 14, 64, 16, -1, 18, -1, 69, 384, - -1, 23, -1, 74, 75, 27, -1, 29, -1, -1, - 32, -1, 83, 35, 36, 400, 38, -1, -1, 41, + -1, 32, -1, -1, 35, 36, -1, 38, -1, -1, + -1, -1, -1, 44, 45, -1, -1, -1, 49, 50, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 346, + 347, 348, 349, 64, -1, -1, -1, -1, 69, -1, + -1, -1, -1, 74, 75, -1, -1, -1, -1, -1, + 367, 368, 83, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 389, -1, -1, -1, -1, -1, -1, -1, + -1, 3, 4, 5, -1, -1, 8, 9, 405, 406, + 407, 13, 14, -1, 16, -1, 18, -1, -1, -1, + -1, 23, -1, -1, -1, 27, -1, 29, -1, -1, + 32, -1, -1, 35, 36, -1, 38, -1, -1, 41, -1, -1, 44, 45, 46, -1, -1, 49, 50, -1, - -1, 416, 417, 418, -1, -1, 58, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 58, -1, -1, -1, 62, 63, 64, -1, 66, -1, 68, 69, -1, 71, -1, -1, 74, 75, 3, 4, 5, -1, -1, 8, 9, 83, 84, -1, 13, 14, -1, 16, -1, 18, 92, -1, -1, -1, 23, -1, -1, -1, 27, -1, 29, -1, -1, 32, -1, -1, 35, 36, -1, 38, -1, -1, 41, -1, -1, 44, 45, 46, -1, -1, - 49, 50, -1, -1, -1, -1, -1, -1, -1, 58, + 49, 50, 519, 520, 521, 522, -1, -1, -1, 58, -1, -1, -1, 62, 63, 64, -1, 66, -1, 68, - 69, -1, 71, -1, -1, 74, 75, -1, -1, -1, - -1, -1, -1, -1, 83, 84, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 535, 536, 537, 538, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 562, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 573, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 617, -1, 619 + 69, -1, 71, -1, -1, 74, 75, -1, -1, 546, + -1, -1, -1, -1, 83, 84, 3, 4, 5, -1, + 557, 8, 9, 92, -1, -1, 13, 14, -1, 16, + -1, 18, -1, -1, -1, -1, 23, -1, -1, -1, + 27, -1, 29, -1, -1, 32, -1, -1, 35, 36, + -1, 38, -1, -1, 41, -1, -1, 44, 45, 46, + -1, -1, 49, 50, 601, -1, 603, -1, -1, -1, + -1, 58, -1, -1, -1, 62, 63, 64, -1, 66, + -1, 68, 69, -1, 71, -1, -1, 74, 75, -1, + -1, -1, -1, -1, -1, -1, 83, 84 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM. */ static const unsigned char yystos[] = { - 0, 87, 88, 89, 90, 94, 95, 211, 123, 211, - 101, 211, 164, 211, 0, 3, 4, 5, 14, 16, + 0, 87, 88, 89, 90, 94, 95, 209, 123, 209, + 101, 209, 162, 209, 0, 3, 4, 5, 14, 16, 27, 29, 32, 35, 36, 38, 44, 45, 49, 50, 64, 69, 74, 75, 83, 96, 97, 98, 99, 102, - 105, 106, 117, 119, 121, 149, 151, 153, 155, 157, - 159, 161, 182, 205, 8, 9, 13, 18, 23, 41, + 105, 106, 117, 119, 121, 147, 149, 151, 153, 155, + 157, 159, 180, 203, 8, 9, 13, 18, 23, 41, 46, 58, 62, 63, 66, 68, 71, 84, 96, 126, - 145, 147, 58, 71, 137, 7, 15, 42, 43, 52, - 58, 69, 73, 84, 174, 202, 204, 205, 211, 91, - 202, 202, 202, 202, 202, 201, 205, 211, 202, 202, - 202, 202, 202, 201, 202, 202, 201, 27, 91, 91, - 202, 91, 91, 91, 91, 201, 91, 91, 202, 91, - 127, 91, 201, 138, 91, 3, 4, 210, 91, 91, - 91, 201, 91, 91, 91, 91, 203, 205, 211, 91, - 118, 120, 122, 158, 91, 162, 160, 156, 150, 183, - 91, 152, 154, 107, 202, 205, 3, 4, 208, 91, - 5, 210, 5, 210, 210, 203, 91, 210, 24, 148, - 91, 210, 91, 196, 211, 91, 91, 173, 210, 91, - 170, 199, 201, 171, 208, 172, 208, 91, 169, 201, - 168, 198, 201, 196, 205, 206, 207, 211, 92, 203, - 91, 91, 91, 91, 103, 91, 91, 91, 91, 91, - 203, 91, 91, 91, 91, 92, 208, 124, 205, 92, - 92, 92, 92, 92, 92, 3, 4, 5, 209, 92, - 91, 92, 206, 92, 128, 211, 146, 210, 211, 209, - 139, 211, 92, 165, 92, 19, 92, 208, 20, 92, - 208, 209, 92, 92, 51, 92, 205, 92, 123, 123, - 123, 164, 104, 211, 167, 211, 166, 211, 164, 164, - 186, 211, 100, 164, 164, 108, 211, 203, 208, 125, - 211, 92, 208, 92, 40, 53, 54, 55, 56, 59, - 72, 92, 129, 130, 131, 132, 133, 134, 135, 51, - 58, 92, 39, 53, 59, 72, 92, 140, 141, 142, - 143, 163, 211, 91, 205, 208, 91, 205, 208, 92, - 91, 92, 92, 92, 92, 58, 92, 7, 33, 42, - 43, 47, 52, 58, 69, 73, 92, 174, 7, 42, - 43, 47, 52, 58, 69, 73, 76, 78, 80, 92, - 161, 174, 92, 92, 11, 57, 85, 86, 92, 182, - 184, 187, 190, 193, 101, 92, 92, 81, 92, 109, - 92, 92, 92, 205, 208, 91, 91, 91, 91, 91, - 91, 91, 91, 201, 91, 91, 91, 91, 43, 52, - 92, 205, 91, 205, 91, 208, 200, 201, 201, 91, - 91, 91, 91, 91, 91, 201, 91, 91, 91, 91, - 91, 91, 91, 201, 91, 91, 91, 91, 91, 202, - 202, 202, 202, 92, 110, 210, 81, 208, 136, 208, - 211, 208, 208, 208, 208, 208, 208, 200, 91, 144, - 208, 211, 208, 208, 208, 91, 91, 208, 208, 208, - 208, 92, 91, 173, 181, 197, 211, 170, 171, 180, - 210, 172, 91, 169, 168, 173, 170, 171, 175, 210, - 172, 91, 169, 168, 178, 211, 176, 197, 177, 197, - 185, 188, 191, 194, 91, 111, 91, 81, 92, 208, - 208, 92, 92, 92, 92, 208, 208, 92, 209, 92, - 208, 92, 208, 208, 171, 172, 208, 208, 208, 208, - 92, 209, 92, 92, 208, 92, 92, 92, 92, 209, - 92, 92, 92, 92, 92, 92, 210, 92, 209, 92, - 92, 37, 92, 92, 92, 91, 91, 91, 91, 112, - 208, 91, 208, 91, 208, 208, 208, 208, 92, 92, - 208, 92, 92, 92, 92, 208, 208, 208, 208, 92, - 92, 92, 91, 186, 189, 211, 192, 211, 195, 211, - 22, 43, 52, 79, 92, 208, 112, 208, 208, 208, - 208, 92, 92, 208, 92, 92, 208, 208, 179, 211, - 92, 58, 65, 92, 58, 65, 92, 58, 92, 187, - 91, 205, 91, 91, 202, 208, 92, 208, 208, 208, - 92, 208, 92, 92, 92, 161, 201, 91, 201, 91, - 201, 205, 91, 115, 208, 116, 208, 91, 208, 92, - 208, 208, 208, 91, 197, 91, 197, 91, 208, 208, - 19, 92, 208, 20, 92, 208, 113, 92, 92, 208, - 208, 209, 92, 209, 92, 209, 208, 208, 91, 205, - 208, 91, 205, 208, 114, 208, 92, 208, 208, 92, - 92, 92, 208, 208, 205, 91, 205, 91, 208, 10, - 21, 67, 92, 208, 208, 208, 92, 92, 208, 208, - 208, 208, 91, 91, 205, 91, 208, 208, 208, 208, - 208, 208, 205, 91, 208, 208, 208, 208, 208, 208, - 208, 208, 208, 208, 208, 92, 92, 208, 208, 208, - 208, 208, 208, 208, 92, 92, 92, 92, 92, 92, - 208, 208, 208 + 143, 145, 58, 126, 7, 15, 42, 43, 52, 58, + 69, 73, 84, 172, 200, 202, 203, 209, 91, 200, + 200, 200, 200, 200, 199, 203, 209, 200, 200, 200, + 200, 200, 199, 200, 200, 199, 27, 91, 91, 200, + 91, 91, 91, 91, 199, 91, 91, 200, 91, 127, + 91, 199, 91, 3, 4, 208, 91, 91, 91, 199, + 91, 91, 91, 91, 201, 203, 209, 91, 118, 120, + 122, 156, 91, 160, 158, 154, 148, 181, 91, 150, + 152, 107, 200, 203, 3, 4, 206, 91, 5, 208, + 5, 208, 208, 201, 91, 208, 24, 146, 91, 208, + 91, 194, 209, 91, 171, 208, 91, 168, 197, 199, + 169, 206, 170, 206, 91, 167, 199, 166, 196, 199, + 194, 203, 204, 205, 209, 92, 201, 91, 91, 91, + 91, 103, 91, 91, 91, 91, 91, 201, 91, 91, + 91, 91, 92, 206, 124, 203, 92, 92, 92, 92, + 92, 92, 3, 4, 5, 207, 92, 91, 92, 204, + 92, 128, 209, 144, 208, 209, 207, 92, 163, 92, + 19, 92, 206, 20, 92, 206, 207, 92, 92, 51, + 92, 203, 92, 123, 123, 123, 162, 104, 209, 165, + 209, 164, 209, 162, 162, 184, 209, 100, 162, 162, + 108, 209, 201, 206, 125, 209, 92, 206, 92, 39, + 40, 53, 54, 55, 56, 59, 72, 92, 129, 130, + 131, 132, 133, 134, 135, 136, 137, 138, 139, 141, + 51, 58, 92, 161, 209, 91, 203, 206, 91, 203, + 206, 92, 91, 92, 92, 92, 92, 58, 92, 7, + 33, 42, 43, 47, 52, 58, 69, 73, 92, 172, + 7, 42, 43, 47, 52, 58, 69, 73, 76, 78, + 80, 92, 159, 172, 92, 92, 11, 57, 85, 86, + 92, 180, 182, 185, 188, 191, 101, 92, 92, 81, + 92, 109, 92, 92, 92, 203, 206, 91, 91, 91, + 91, 91, 91, 91, 91, 91, 199, 43, 52, 92, + 203, 91, 203, 91, 206, 198, 199, 199, 91, 91, + 91, 91, 91, 91, 199, 91, 91, 91, 91, 91, + 91, 91, 199, 91, 91, 91, 91, 91, 200, 200, + 200, 200, 92, 110, 208, 81, 206, 140, 206, 209, + 142, 206, 209, 206, 206, 206, 206, 206, 206, 198, + 91, 91, 91, 206, 206, 206, 206, 92, 91, 171, + 179, 195, 209, 168, 169, 178, 208, 170, 91, 167, + 166, 171, 168, 169, 173, 208, 170, 91, 167, 166, + 176, 209, 174, 195, 175, 195, 183, 186, 189, 192, + 91, 111, 91, 81, 92, 206, 92, 206, 92, 206, + 92, 92, 92, 92, 206, 206, 92, 207, 169, 170, + 206, 206, 206, 206, 92, 207, 92, 92, 206, 92, + 92, 92, 92, 207, 92, 92, 92, 92, 92, 92, + 208, 92, 207, 92, 92, 37, 92, 92, 92, 91, + 91, 91, 91, 112, 206, 91, 206, 91, 206, 206, + 206, 92, 206, 92, 206, 92, 92, 92, 92, 206, + 206, 206, 206, 92, 92, 92, 91, 184, 187, 209, + 190, 209, 193, 209, 22, 43, 52, 79, 92, 206, + 112, 206, 206, 206, 206, 206, 92, 92, 92, 92, + 206, 206, 177, 209, 92, 58, 65, 92, 58, 65, + 92, 58, 92, 185, 91, 203, 91, 91, 200, 206, + 92, 206, 206, 206, 206, 92, 92, 92, 92, 159, + 199, 91, 199, 91, 199, 203, 91, 115, 206, 116, + 206, 91, 206, 92, 206, 206, 206, 91, 195, 91, + 195, 91, 206, 206, 19, 92, 206, 20, 92, 206, + 113, 92, 92, 206, 206, 207, 92, 207, 92, 207, + 206, 206, 91, 203, 206, 91, 203, 206, 114, 206, + 92, 206, 206, 92, 92, 92, 206, 206, 203, 91, + 203, 91, 206, 10, 21, 67, 92, 206, 206, 206, + 92, 92, 206, 206, 206, 206, 91, 91, 203, 91, + 206, 206, 206, 206, 206, 206, 206, 206, 203, 91, + 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, + 206, 206, 206, 92, 92, 206, 206, 206, 206, 206, + 206, 206, 206, 92, 92, 92, 92, 206, 92, 206, + 92, 206, 206, 92, 92, 206, 206, 206, 206 }; #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__) @@ -1461,7 +1467,7 @@ static const unsigned char yystos[] = #define YYACCEPT goto yyacceptlab #define YYABORT goto yyabortlab -#define YYERROR goto yyerrlab1 +#define YYERROR goto yyerrorlab /* Like YYERROR except do call yyerror. This remains here temporarily @@ -1489,20 +1495,53 @@ do \ } \ while (0) + #define YYTERROR 1 #define YYERRCODE 256 -/* YYLLOC_DEFAULT -- Compute the default location (before the actions - are run). */ +/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. + If N is 0, then set CURRENT to the empty location which ends + the previous symbol: RHS[0] (always defined). */ + +#define YYRHSLOC(Rhs, K) ((Rhs)[K]) #ifndef YYLLOC_DEFAULT -# define YYLLOC_DEFAULT(Current, Rhs, N) \ - Current.first_line = Rhs[1].first_line; \ - Current.first_column = Rhs[1].first_column; \ - Current.last_line = Rhs[N].last_line; \ - Current.last_column = Rhs[N].last_column; +# define YYLLOC_DEFAULT(Current, Rhs, N) \ + do \ + if (N) \ + { \ + (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \ + (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \ + (Current).last_line = YYRHSLOC (Rhs, N).last_line; \ + (Current).last_column = YYRHSLOC (Rhs, N).last_column; \ + } \ + else \ + { \ + (Current).first_line = (Current).last_line = \ + YYRHSLOC (Rhs, 0).last_line; \ + (Current).first_column = (Current).last_column = \ + YYRHSLOC (Rhs, 0).last_column; \ + } \ + while (0) #endif + +/* YY_LOCATION_PRINT -- Print the location on the stream. + This macro was not mandated originally: define only if we know + we won't break user code: when these are the locations we know. */ + +#ifndef YY_LOCATION_PRINT +# if YYLTYPE_IS_TRIVIAL +# define YY_LOCATION_PRINT(File, Loc) \ + fprintf (File, "%d.%d-%d.%d", \ + (Loc).first_line, (Loc).first_column, \ + (Loc).last_line, (Loc).last_column) +# else +# define YY_LOCATION_PRINT(File, Loc) ((void) 0) +# endif +#endif + + /* YYLEX -- calling `yylex' with the right arguments. */ #ifdef YYLEX_PARAM @@ -1525,36 +1564,30 @@ do { \ YYFPRINTF Args; \ } while (0) -# define YYDSYMPRINT(Args) \ -do { \ - if (yydebug) \ - yysymprint Args; \ -} while (0) - -# define YYDSYMPRINTF(Title, Token, Value, Location) \ +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \ do { \ if (yydebug) \ { \ YYFPRINTF (stderr, "%s ", Title); \ yysymprint (stderr, \ - Token, Value); \ + Type, Value); \ YYFPRINTF (stderr, "\n"); \ } \ } while (0) /*------------------------------------------------------------------. | yy_stack_print -- Print the state stack from its BOTTOM up to its | -| TOP (cinluded). | +| TOP (included). | `------------------------------------------------------------------*/ #if defined (__STDC__) || defined (__cplusplus) static void -yy_stack_print (short *bottom, short *top) +yy_stack_print (short int *bottom, short int *top) #else static void yy_stack_print (bottom, top) - short *bottom; - short *top; + short int *bottom; + short int *top; #endif { YYFPRINTF (stderr, "Stack now"); @@ -1604,8 +1637,7 @@ do { \ int yydebug; #else /* !YYDEBUG */ # define YYDPRINTF(Args) -# define YYDSYMPRINT(Args) -# define YYDSYMPRINTF(Title, Token, Value, Location) +# define YY_SYMBOL_PRINT(Title, Type, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !YYDEBUG */ @@ -1623,10 +1655,6 @@ int yydebug; SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ -#if YYMAXDEPTH == 0 -# undef YYMAXDEPTH -#endif - #ifndef YYMAXDEPTH # define YYMAXDEPTH 10000 #endif @@ -1708,15 +1736,15 @@ yysymprint (yyoutput, yytype, yyvaluep) (void) yyvaluep; if (yytype < YYNTOKENS) - { - YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); -# ifdef YYPRINT - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); -# endif - } + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]); else YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); + +# ifdef YYPRINT + if (yytype < YYNTOKENS) + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); +# endif switch (yytype) { default: @@ -1732,10 +1760,11 @@ yysymprint (yyoutput, yytype, yyvaluep) #if defined (__STDC__) || defined (__cplusplus) static void -yydestruct (int yytype, YYSTYPE *yyvaluep) +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) #else static void -yydestruct (yytype, yyvaluep) +yydestruct (yymsg, yytype, yyvaluep) + const char *yymsg; int yytype; YYSTYPE *yyvaluep; #endif @@ -1743,6 +1772,10 @@ yydestruct (yytype, yyvaluep) /* Pacify ``unused variable'' warnings. */ (void) yyvaluep; + if (!yymsg) + yymsg = "Deleting"; + YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp); + switch (yytype) { @@ -1770,10 +1803,10 @@ int yyparse (); -/* The lookahead symbol. */ +/* The look-ahead symbol. */ int yychar; -/* The semantic value of the lookahead symbol. */ +/* The semantic value of the look-ahead symbol. */ YYSTYPE yylval; /* Number of syntax errors so far. */ @@ -1809,7 +1842,7 @@ yyparse () int yyresult; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus; - /* Lookahead token as an internal (translated) token number. */ + /* Look-ahead token as an internal (translated) token number. */ int yytoken = 0; /* Three stacks and their tools: @@ -1821,9 +1854,9 @@ yyparse () to reallocate them elsewhere. */ /* The state stack. */ - short yyssa[YYINITDEPTH]; - short *yyss = yyssa; - register short *yyssp; + short int yyssa[YYINITDEPTH]; + short int *yyss = yyssa; + register short int *yyssp; /* The semantic value stack. */ YYSTYPE yyvsa[YYINITDEPTH]; @@ -1860,6 +1893,9 @@ yyparse () yyssp = yyss; yyvsp = yyvs; + + yyvsp[0] = yylval; + goto yysetstate; /*------------------------------------------------------------. @@ -1885,7 +1921,7 @@ yyparse () these so that the &'s don't force the real ones into memory. */ YYSTYPE *yyvs1 = yyvs; - short *yyss1 = yyss; + short int *yyss1 = yyss; /* Each stack pointer address is followed by the size of the @@ -1913,7 +1949,7 @@ yyparse () yystacksize = YYMAXDEPTH; { - short *yyss1 = yyss; + short int *yyss1 = yyss; union yyalloc *yyptr = (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize)); if (! yyptr) @@ -1949,18 +1985,18 @@ yyparse () yybackup: /* Do appropriate processing given the current state. */ -/* Read a lookahead token if we need one and don't already have one. */ +/* Read a look-ahead token if we need one and don't already have one. */ /* yyresume: */ - /* First try to decide what to do without reference to lookahead token. */ + /* First try to decide what to do without reference to look-ahead token. */ yyn = yypact[yystate]; if (yyn == YYPACT_NINF) goto yydefault; - /* Not known => get a lookahead token if don't already have one. */ + /* Not known => get a look-ahead token if don't already have one. */ - /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */ + /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol. */ if (yychar == YYEMPTY) { YYDPRINTF ((stderr, "Reading a token: ")); @@ -1975,7 +2011,7 @@ yybackup: else { yytoken = YYTRANSLATE (yychar); - YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc); + YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); } /* If the proper action on seeing token YYTOKEN is to reduce or to @@ -1995,8 +2031,8 @@ yybackup: if (yyn == YYFINAL) YYACCEPT; - /* Shift the lookahead token. */ - YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken])); + /* Shift the look-ahead token. */ + YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); /* Discard the token being shifted unless it is eof. */ if (yychar != YYEOF) @@ -2049,14 +2085,14 @@ yyreduce: #line 232 "parser.yxx" { assert(!egg_stack.empty()); - DCAST(EggData, egg_stack.back())->add_child(DCAST(EggNode, yyvsp[0]._egg)); + DCAST(EggData, egg_stack.back())->add_child(DCAST(EggNode, (yyvsp[0]._egg))); } break; case 25: #line 275 "parser.yxx" { - string strval = yyvsp[-1]._string; + string strval = (yyvsp[-1]._string); EggCoordinateSystem *cs = new EggCoordinateSystem; CoordinateSystem f = parse_coordinate_system_string(strval); @@ -2065,22 +2101,22 @@ yyreduce: } else { cs->set_value(f); } - yyval._egg = cs; + (yyval._egg) = cs; } break; case 26: #line 298 "parser.yxx" { - yyval._egg = new EggComment(yyvsp[-3]._string, yyvsp[-1]._string); + (yyval._egg) = new EggComment((yyvsp[-3]._string), (yyvsp[-1]._string)); } break; case 27: #line 312 "parser.yxx" { - string tref_name = yyvsp[-2]._string; - Filename filename = yyvsp[0]._string; + string tref_name = (yyvsp[-2]._string); + Filename filename = (yyvsp[0]._string); EggTexture *texture = new EggTexture(tref_name, filename); if (textures.find(tref_name) != textures.end()) { @@ -2095,7 +2131,7 @@ yyreduce: case 28: #line 325 "parser.yxx" { - yyval._egg = egg_stack.back(); + (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); } break; @@ -2104,9 +2140,9 @@ yyreduce: #line 341 "parser.yxx" { EggTexture *texture = DCAST(EggTexture, egg_stack.back()); - string name = yyvsp[-3]._string; - double value = yyvsp[-1]._number; - string strval = yyvsp[-1]._string; + string name = (yyvsp[-3]._string); + double value = (yyvsp[-1]._number); + string strval = (yyvsp[-1]._string); if (cmp_nocase_uh(name, "format") == 0) { EggTexture::Format f = EggTexture::string_format(strval); @@ -2391,7 +2427,7 @@ yyreduce: case 32: #line 637 "parser.yxx" { - string mref_name = yyvsp[-1]._string; + string mref_name = (yyvsp[-1]._string); EggMaterial *material = new EggMaterial(mref_name); if (materials.find(mref_name) != materials.end()) { @@ -2406,7 +2442,7 @@ yyreduce: case 33: #line 649 "parser.yxx" { - yyval._egg = egg_stack.back(); + (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); } break; @@ -2415,8 +2451,8 @@ yyreduce: #line 665 "parser.yxx" { EggMaterial *material = DCAST(EggMaterial, egg_stack.back()); - string name = yyvsp[-3]._string; - double value = yyvsp[-1]._number; + string name = (yyvsp[-3]._string); + double value = (yyvsp[-1]._number); if (cmp_nocase_uh(name, "diffr") == 0) { Colorf diff = material->get_diff(); @@ -2501,30 +2537,30 @@ yyreduce: case 36: #line 760 "parser.yxx" { - string node_name = yyvsp[-3]._string; - Filename filename = yyvsp[-1]._string; + string node_name = (yyvsp[-3]._string); + Filename filename = (yyvsp[-1]._string); EggExternalReference *ref = new EggExternalReference(node_name, filename); - yyval._egg = ref; + (yyval._egg) = ref; } break; case 37: #line 767 "parser.yxx" { - if (cmp_nocase_uh(yyvsp[-5]._string, "group") != 0) { + if (cmp_nocase_uh((yyvsp[-5]._string), "group") != 0) { eggyyerror("keyword 'group' expected"); } - string node_name = yyvsp[-3]._string; - Filename filename = yyvsp[-1]._string; + string node_name = (yyvsp[-3]._string); + Filename filename = (yyvsp[-1]._string); EggExternalReference *ref = new EggExternalReference(node_name, filename); - yyval._egg = ref; + (yyval._egg) = ref; } break; case 38: #line 787 "parser.yxx" { - string name = yyvsp[0]._string; + string name = (yyvsp[0]._string); EggVertexPool *pool = NULL; VertexPools::const_iterator vpi = vertex_pools.find(name); @@ -2551,7 +2587,7 @@ yyreduce: case 39: #line 811 "parser.yxx" { - yyval._egg = egg_stack.back(); + (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); } break; @@ -2576,7 +2612,7 @@ yyreduce: case 44: #line 850 "parser.yxx" { - vertex_index = (int)yyvsp[0]._number; + vertex_index = (int)(yyvsp[0]._number); EggVertexPool *pool = DCAST(EggVertexPool, egg_stack.back()); if (vertex_index < 0) { @@ -2617,28 +2653,28 @@ yyreduce: case 46: #line 896 "parser.yxx" { - DCAST(EggVertex, egg_stack.back())->set_pos(yyvsp[0]._number); + DCAST(EggVertex, egg_stack.back())->set_pos((yyvsp[0]._number)); } break; case 47: #line 900 "parser.yxx" { - DCAST(EggVertex, egg_stack.back())->set_pos(LPoint2d(yyvsp[-1]._number, yyvsp[0]._number)); + DCAST(EggVertex, egg_stack.back())->set_pos(LPoint2d((yyvsp[-1]._number), (yyvsp[0]._number))); } break; case 48: #line 904 "parser.yxx" { - DCAST(EggVertex, egg_stack.back())->set_pos(LPoint3d(yyvsp[-2]._number, yyvsp[-1]._number, yyvsp[0]._number)); + DCAST(EggVertex, egg_stack.back())->set_pos(LPoint3d((yyvsp[-2]._number), (yyvsp[-1]._number), (yyvsp[0]._number))); } break; case 49: #line 908 "parser.yxx" { - DCAST(EggVertex, egg_stack.back())->set_pos(LPoint4d(yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number, yyvsp[0]._number)); + DCAST(EggVertex, egg_stack.back())->set_pos(LPoint4d((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number), (yyvsp[0]._number))); } break; @@ -2646,10 +2682,10 @@ yyreduce: #line 912 "parser.yxx" { EggVertex *vertex = DCAST(EggVertex, egg_stack.back()); - EggVertexUV *uv = new EggVertexUV(yyvsp[-1]._string, TexCoordd::zero()); + EggVertexUV *uv = new EggVertexUV((yyvsp[-1]._string), TexCoordd::zero()); egg_stack.push_back(uv); - if (vertex->has_uv(yyvsp[-1]._string)) { - eggyywarning("Ignoring repeated UV name " + yyvsp[-1]._string); + if (vertex->has_uv((yyvsp[-1]._string))) { + eggyywarning("Ignoring repeated UV name " + (yyvsp[-1]._string)); } else { vertex->set_uv_obj(uv); } @@ -2667,9 +2703,9 @@ yyreduce: #line 929 "parser.yxx" { bool inserted = DCAST(EggVertex, egg_stack.back())->_dxyzs. - insert(EggMorphVertex(yyvsp[-5]._string, LVector3d(yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number))).second; + insert(EggMorphVertex((yyvsp[-5]._string), LVector3d((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number)))).second; if (!inserted) { - eggyywarning("Ignoring repeated morph name " + yyvsp[-5]._string); + eggyywarning("Ignoring repeated morph name " + (yyvsp[-5]._string)); } } break; @@ -2678,9 +2714,9 @@ yyreduce: #line 937 "parser.yxx" { bool inserted = DCAST(EggVertex, egg_stack.back())->_dxyzs. - insert(EggMorphVertex(yyvsp[-4]._string, LVector3d(yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number))).second; + insert(EggMorphVertex((yyvsp[-4]._string), LVector3d((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number)))).second; if (!inserted) { - eggyywarning("Ignoring repeated morph name " + yyvsp[-4]._string); + eggyywarning("Ignoring repeated morph name " + (yyvsp[-4]._string)); } } break; @@ -2688,170 +2724,199 @@ yyreduce: case 56: #line 956 "parser.yxx" { - DCAST(EggVertexUV, egg_stack.back())->set_uv(TexCoordd(yyvsp[-1]._number, yyvsp[0]._number)); + DCAST(EggVertexUV, egg_stack.back())->set_uv(TexCoordd((yyvsp[-1]._number), (yyvsp[0]._number))); } break; case 57: #line 960 "parser.yxx" { - if (DCAST(EggVertexUV, egg_stack.back())->has_tangent()) { - eggyywarning("Ignoring repeated tangent"); - } else { - DCAST(EggVertexUV, egg_stack.back())->set_tangent(Normald(yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number)); - } + DCAST(EggVertexUV, egg_stack.back())->set_uvw(LVecBase3d((yyvsp[-2]._number), (yyvsp[-1]._number), (yyvsp[0]._number))); } break; case 58: -#line 968 "parser.yxx" +#line 964 "parser.yxx" { - if (DCAST(EggVertexUV, egg_stack.back())->has_binormal()) { - eggyywarning("Ignoring repeated binormal"); + if (DCAST(EggVertexUV, egg_stack.back())->has_tangent()) { + eggyywarning("Ignoring repeated tangent"); } else { - DCAST(EggVertexUV, egg_stack.back())->set_binormal(Normald(yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number)); + DCAST(EggVertexUV, egg_stack.back())->set_tangent(Normald((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number))); } } break; case 59: -#line 976 "parser.yxx" +#line 972 "parser.yxx" { - bool inserted = DCAST(EggVertexUV, egg_stack.back())->_duvs. - insert(EggMorphTexCoord(yyvsp[-4]._string, LVector2d(yyvsp[-2]._number, yyvsp[-1]._number))).second; - if (!inserted) { - eggyywarning("Ignoring repeated morph name " + yyvsp[-4]._string); + if (DCAST(EggVertexUV, egg_stack.back())->has_binormal()) { + eggyywarning("Ignoring repeated binormal"); + } else { + DCAST(EggVertexUV, egg_stack.back())->set_binormal(Normald((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number))); } } break; case 60: -#line 984 "parser.yxx" +#line 980 "parser.yxx" { bool inserted = DCAST(EggVertexUV, egg_stack.back())->_duvs. - insert(EggMorphTexCoord(yyvsp[-3]._string, LVector2d(yyvsp[-2]._number, yyvsp[-1]._number))).second; + insert(EggMorphTexCoord((yyvsp[-4]._string), LVector3d((yyvsp[-2]._number), (yyvsp[-1]._number), 0.0))).second; if (!inserted) { - eggyywarning("Ignoring repeated morph name " + yyvsp[-3]._string); + eggyywarning("Ignoring repeated morph name " + (yyvsp[-4]._string)); } } break; case 61: -#line 1002 "parser.yxx" +#line 988 "parser.yxx" { - DCAST(EggVertex, egg_stack.back())->set_normal(Normald(yyvsp[-2]._number, yyvsp[-1]._number, yyvsp[0]._number)); + bool inserted = DCAST(EggVertexUV, egg_stack.back())->_duvs. + insert(EggMorphTexCoord((yyvsp[-5]._string), LVector3d((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number)))).second; + if (!inserted) { + eggyywarning("Ignoring repeated morph name " + (yyvsp[-5]._string)); + } } break; case 62: -#line 1006 "parser.yxx" +#line 996 "parser.yxx" { - bool inserted = DCAST(EggVertex, egg_stack.back())->_dnormals. - insert(EggMorphNormal(yyvsp[-5]._string, LVector3d(yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number))).second; + bool inserted = DCAST(EggVertexUV, egg_stack.back())->_duvs. + insert(EggMorphTexCoord((yyvsp[-3]._string), LVector3d((yyvsp[-2]._number), (yyvsp[-1]._number), 0.0))).second; if (!inserted) { - eggyywarning("Ignoring repeated morph name " + yyvsp[-5]._string); + eggyywarning("Ignoring repeated morph name " + (yyvsp[-3]._string)); } } break; case 63: -#line 1014 "parser.yxx" +#line 1004 "parser.yxx" { - bool inserted = DCAST(EggVertex, egg_stack.back())->_dnormals. - insert(EggMorphNormal(yyvsp[-4]._string, LVector3d(yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number))).second; + bool inserted = DCAST(EggVertexUV, egg_stack.back())->_duvs. + insert(EggMorphTexCoord((yyvsp[-4]._string), LVector3d((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number)))).second; if (!inserted) { - eggyywarning("Ignoring repeated morph name " + yyvsp[-4]._string); + eggyywarning("Ignoring repeated morph name " + (yyvsp[-4]._string)); } } break; case 64: -#line 1032 "parser.yxx" +#line 1022 "parser.yxx" { - DCAST(EggVertex, egg_stack.back())->set_color(Colorf(yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number, yyvsp[0]._number)); + DCAST(EggVertex, egg_stack.back())->set_normal(Normald((yyvsp[-2]._number), (yyvsp[-1]._number), (yyvsp[0]._number))); } break; case 65: -#line 1036 "parser.yxx" +#line 1026 "parser.yxx" { - bool inserted = DCAST(EggVertex, egg_stack.back())->_drgbas. - insert(EggMorphColor(yyvsp[-6]._string, LVector4f(yyvsp[-4]._number, yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number))).second; + bool inserted = DCAST(EggVertex, egg_stack.back())->_dnormals. + insert(EggMorphNormal((yyvsp[-5]._string), LVector3d((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number)))).second; if (!inserted) { - eggyywarning("Ignoring repeated morph name " + yyvsp[-6]._string); + eggyywarning("Ignoring repeated morph name " + (yyvsp[-5]._string)); } } break; case 66: -#line 1044 "parser.yxx" +#line 1034 "parser.yxx" { - bool inserted = DCAST(EggVertex, egg_stack.back())->_drgbas. - insert(EggMorphColor(yyvsp[-5]._string, LVector4f(yyvsp[-4]._number, yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number))).second; + bool inserted = DCAST(EggVertex, egg_stack.back())->_dnormals. + insert(EggMorphNormal((yyvsp[-4]._string), LVector3d((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number)))).second; if (!inserted) { - eggyywarning("Ignoring repeated morph name " + yyvsp[-5]._string); + eggyywarning("Ignoring repeated morph name " + (yyvsp[-4]._string)); } } break; case 67: -#line 1062 "parser.yxx" +#line 1052 "parser.yxx" { - EggGroup *group = new EggGroup(yyvsp[0]._string); - egg_stack.push_back(group); + DCAST(EggVertex, egg_stack.back())->set_color(Colorf((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number), (yyvsp[0]._number))); } break; case 68: -#line 1067 "parser.yxx" +#line 1056 "parser.yxx" { - yyval._egg = egg_stack.back(); - egg_stack.pop_back(); + bool inserted = DCAST(EggVertex, egg_stack.back())->_drgbas. + insert(EggMorphColor((yyvsp[-6]._string), LVector4f((yyvsp[-4]._number), (yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number)))).second; + if (!inserted) { + eggyywarning("Ignoring repeated morph name " + (yyvsp[-6]._string)); + } } break; case 69: +#line 1064 "parser.yxx" + { + bool inserted = DCAST(EggVertex, egg_stack.back())->_drgbas. + insert(EggMorphColor((yyvsp[-5]._string), LVector4f((yyvsp[-4]._number), (yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number)))).second; + if (!inserted) { + eggyywarning("Ignoring repeated morph name " + (yyvsp[-5]._string)); + } +} + break; + + case 70: #line 1082 "parser.yxx" { - EggGroup *group = new EggGroup(yyvsp[0]._string); + EggGroup *group = new EggGroup((yyvsp[0]._string)); + egg_stack.push_back(group); +} + break; + + case 71: +#line 1087 "parser.yxx" + { + (yyval._egg) = egg_stack.back(); + egg_stack.pop_back(); +} + break; + + case 72: +#line 1102 "parser.yxx" + { + EggGroup *group = new EggGroup((yyvsp[0]._string)); group->set_group_type(EggGroup::GT_joint); egg_stack.push_back(group); } break; - case 70: -#line 1088 "parser.yxx" + case 73: +#line 1108 "parser.yxx" { - yyval._egg = egg_stack.back(); - egg_stack.pop_back(); -} - break; - - case 71: -#line 1103 "parser.yxx" - { - EggGroup *group = new EggGroup(yyvsp[0]._string); - group->set_group_type(EggGroup::GT_instance); - egg_stack.push_back(group); -} - break; - - case 72: -#line 1109 "parser.yxx" - { - yyval._egg = egg_stack.back(); + (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); } break; case 74: -#line 1125 "parser.yxx" +#line 1123 "parser.yxx" + { + EggGroup *group = new EggGroup((yyvsp[0]._string)); + group->set_group_type(EggGroup::GT_instance); + egg_stack.push_back(group); +} + break; + + case 75: +#line 1129 "parser.yxx" + { + (yyval._egg) = egg_stack.back(); + egg_stack.pop_back(); +} + break; + + case 77: +#line 1145 "parser.yxx" { EggGroup *group = DCAST(EggGroup, egg_stack.back()); - string name = yyvsp[-3]._string; - double value = yyvsp[-1]._number; - unsigned long ulong_value = yyvsp[-1]._ulong; - string strval = yyvsp[-1]._string; + string name = (yyvsp[-3]._string); + double value = (yyvsp[-1]._number); + unsigned long ulong_value = (yyvsp[-1]._ulong); + string strval = (yyvsp[-1]._string); if (cmp_nocase_uh(name, "fps") == 0) { group->set_switch_fps(value); @@ -2977,11 +3042,11 @@ yyreduce: } break; - case 75: -#line 1255 "parser.yxx" + case 78: +#line 1275 "parser.yxx" { EggGroup *group = DCAST(EggGroup, egg_stack.back()); - string strval = yyvsp[-1]._string; + string strval = (yyvsp[-1]._string); EggGroup::BillboardType f = EggGroup::string_billboard_type(strval); if (f == EggGroup::BT_none) { @@ -2992,39 +3057,39 @@ yyreduce: } break; - case 76: -#line 1267 "parser.yxx" + case 79: +#line 1287 "parser.yxx" { EggGroup *group = DCAST(EggGroup, egg_stack.back()); - group->set_billboard_center(LPoint3d(yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number)); + group->set_billboard_center(LPoint3d((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number))); } break; - case 77: -#line 1272 "parser.yxx" + case 80: +#line 1292 "parser.yxx" { EggGroup *group = DCAST(EggGroup, egg_stack.back()); - string name = yyvsp[-4]._string; + string name = (yyvsp[-4]._string); group->set_collision_name(name); } break; - case 78: -#line 1279 "parser.yxx" + case 81: +#line 1299 "parser.yxx" { EggGroup *group = DCAST(EggGroup, egg_stack.back()); - int value = (int)yyvsp[-1]._number; + int value = (int)(yyvsp[-1]._number); group->set_dcs_type(value!=0 ? EggGroup::DC_default : EggGroup::DC_none); } break; - case 79: -#line 1285 "parser.yxx" + case 82: +#line 1305 "parser.yxx" { // The special flavor of DCS, with { sync } or { nosync }. EggGroup *group = DCAST(EggGroup, egg_stack.back()); - string strval = yyvsp[-1]._string; + string strval = (yyvsp[-1]._string); EggGroup::DCSType f = EggGroup::string_dcs_type(strval); if (f == EggGroup::DC_unspecified) { @@ -3035,22 +3100,22 @@ yyreduce: } break; - case 80: -#line 1298 "parser.yxx" + case 83: +#line 1318 "parser.yxx" { // The traditional flavor of DART, with { 0 } or { 1 }. EggGroup *group = DCAST(EggGroup, egg_stack.back()); - int value = (int)yyvsp[-1]._number; + int value = (int)(yyvsp[-1]._number); group->set_dart_type(value!=0 ? EggGroup::DT_default : EggGroup::DT_none); } break; - case 81: -#line 1305 "parser.yxx" + case 84: +#line 1325 "parser.yxx" { // The special flavor of DART, with { sync } or { nosync }. EggGroup *group = DCAST(EggGroup, egg_stack.back()); - string strval = yyvsp[-1]._string; + string strval = (yyvsp[-1]._string); EggGroup::DartType f = EggGroup::string_dart_type(strval); if (f == EggGroup::DT_none) { @@ -3061,62 +3126,62 @@ yyreduce: } break; - case 82: -#line 1318 "parser.yxx" + case 85: +#line 1338 "parser.yxx" { EggGroup *group = DCAST(EggGroup, egg_stack.back()); - int value = (int)yyvsp[-1]._number; + int value = (int)(yyvsp[-1]._number); group->set_switch_flag(value!=0); } break; - case 83: -#line 1324 "parser.yxx" + case 86: +#line 1344 "parser.yxx" { EggGroup *group = DCAST(EggGroup, egg_stack.back()); - string type = yyvsp[-1]._string; + string type = (yyvsp[-1]._string); group->add_object_type(type); } break; - case 84: -#line 1330 "parser.yxx" + case 87: +#line 1350 "parser.yxx" { EggGroup *group = DCAST(EggGroup, egg_stack.back()); - int value = (int)yyvsp[-1]._number; + int value = (int)(yyvsp[-1]._number); group->set_model_flag(value!=0); } break; - case 85: -#line 1336 "parser.yxx" + case 88: +#line 1356 "parser.yxx" { EggGroup *group = DCAST(EggGroup, egg_stack.back()); - group->set_tag(yyvsp[-3]._string, yyvsp[-1]._string); + group->set_tag((yyvsp[-3]._string), (yyvsp[-1]._string)); } break; - case 86: -#line 1341 "parser.yxx" + case 89: +#line 1361 "parser.yxx" { EggGroup *group = DCAST(EggGroup, egg_stack.back()); - int value = (int)yyvsp[-1]._number; + int value = (int)(yyvsp[-1]._number); group->set_texlist_flag(value!=0); } break; - case 90: -#line 1350 "parser.yxx" + case 93: +#line 1370 "parser.yxx" { - DCAST(EggGroup, egg_stack.back())->add_child(DCAST(EggNode, yyvsp[0]._egg)); + DCAST(EggGroup, egg_stack.back())->add_child(DCAST(EggNode, (yyvsp[0]._egg))); } break; - case 91: -#line 1364 "parser.yxx" + case 94: +#line 1384 "parser.yxx" { EggGroup *group = DCAST(EggGroup, egg_stack.back()); - string strval = yyvsp[0]._string; + string strval = (yyvsp[0]._string); EggGroup::CollisionSolidType f = EggGroup::string_cs_type(strval); if (f == EggGroup::CST_none) { @@ -3135,11 +3200,11 @@ yyreduce: } break; - case 93: -#line 1395 "parser.yxx" + case 96: +#line 1415 "parser.yxx" { EggGroup *group = DCAST(EggGroup, egg_stack.back()); - string strval = yyvsp[0]._string; + string strval = (yyvsp[0]._string); EggGroup::CollideFlags f = EggGroup::string_collide_flags(strval); if (f == EggGroup::CF_none) { @@ -3150,125 +3215,112 @@ yyreduce: } break; - case 94: -#line 1417 "parser.yxx" + case 97: +#line 1437 "parser.yxx" { - DCAST(EggGroup, egg_stack.back())->clear_transform(); + egg_stack.back()->as_transform()->clear_transform(); } break; - case 104: -#line 1443 "parser.yxx" + case 112: +#line 1469 "parser.yxx" { - DCAST(EggGroup, egg_stack.back())->add_translate(LVector3d(yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number)); -} - break; - - case 105: -#line 1449 "parser.yxx" - { - DCAST(EggGroup, egg_stack.back())->add_rotx(yyvsp[-1]._number); -} - break; - - case 106: -#line 1455 "parser.yxx" - { - DCAST(EggGroup, egg_stack.back())->add_roty(yyvsp[-1]._number); -} - break; - - case 107: -#line 1461 "parser.yxx" - { - DCAST(EggGroup, egg_stack.back())->add_rotz(yyvsp[-1]._number); -} - break; - - case 108: -#line 1467 "parser.yxx" - { - DCAST(EggGroup, egg_stack.back())->add_rotate(yyvsp[-4]._number, LVector3d(yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number)); -} - break; - - case 109: -#line 1473 "parser.yxx" - { - DCAST(EggGroup, egg_stack.back())->add_scale(LVecBase3d(yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number)); -} - break; - - case 110: -#line 1477 "parser.yxx" - { - DCAST(EggGroup, egg_stack.back())->add_uniform_scale(yyvsp[-1]._number); + egg_stack.back()->as_transform()->add_translate2d(LVector2d((yyvsp[-2]._number), (yyvsp[-1]._number))); } break; case 113: -#line 1492 "parser.yxx" +#line 1476 "parser.yxx" { - DCAST(EggGroup, egg_stack.back())->add_matrix - (LMatrix4d(yyvsp[-15]._number, yyvsp[-14]._number, yyvsp[-13]._number, yyvsp[-12]._number, - yyvsp[-11]._number, yyvsp[-10]._number, yyvsp[-9]._number, yyvsp[-8]._number, - yyvsp[-7]._number, yyvsp[-6]._number, yyvsp[-5]._number, yyvsp[-4]._number, - yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number, yyvsp[0]._number)); + egg_stack.back()->as_transform()->add_translate3d(LVector3d((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number))); } break; case 114: -#line 1511 "parser.yxx" +#line 1483 "parser.yxx" { - matrix_2d = LMatrix3d::ident_mat(); + egg_stack.back()->as_transform()->add_rotate2d((yyvsp[-1]._number)); } break; case 115: -#line 1515 "parser.yxx" +#line 1490 "parser.yxx" { - DCAST(EggTexture, egg_stack.back())->set_transform(matrix_2d); + egg_stack.back()->as_transform()->add_rotx((yyvsp[-1]._number)); +} + break; + + case 116: +#line 1497 "parser.yxx" + { + egg_stack.back()->as_transform()->add_roty((yyvsp[-1]._number)); +} + break; + + case 117: +#line 1504 "parser.yxx" + { + egg_stack.back()->as_transform()->add_rotz((yyvsp[-1]._number)); +} + break; + + case 118: +#line 1511 "parser.yxx" + { + egg_stack.back()->as_transform()->add_rotate3d((yyvsp[-4]._number), LVector3d((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number))); +} + break; + + case 119: +#line 1518 "parser.yxx" + { + egg_stack.back()->as_transform()->add_scale2d(LVecBase2d((yyvsp[-2]._number), (yyvsp[-1]._number))); +} + break; + + case 120: +#line 1525 "parser.yxx" + { + egg_stack.back()->as_transform()->add_scale3d(LVecBase3d((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number))); } break; case 121: -#line 1537 "parser.yxx" +#line 1532 "parser.yxx" { - matrix_2d *= LMatrix3d::translate_mat(yyvsp[-2]._number, yyvsp[-1]._number); + egg_stack.back()->as_transform()->add_uniform_scale((yyvsp[-1]._number)); } break; - case 122: -#line 1543 "parser.yxx" + case 124: +#line 1547 "parser.yxx" { - matrix_2d *= LMatrix3d::rotate_mat(yyvsp[-1]._number); -} - break; - - case 123: -#line 1549 "parser.yxx" - { - matrix_2d *= LMatrix3d::scale_mat(yyvsp[-2]._number, yyvsp[-1]._number); -} - break; - - case 126: -#line 1562 "parser.yxx" - { - matrix_2d *= LMatrix3d(yyvsp[-8]._number, yyvsp[-7]._number, yyvsp[-6]._number, - yyvsp[-5]._number, yyvsp[-4]._number, yyvsp[-3]._number, - yyvsp[-2]._number, yyvsp[-1]._number, yyvsp[0]._number); + egg_stack.back()->as_transform()->add_matrix3 + (LMatrix3d((yyvsp[-15]._number), (yyvsp[-14]._number), (yyvsp[-13]._number), + (yyvsp[-12]._number), (yyvsp[-11]._number), (yyvsp[-10]._number), + (yyvsp[-9]._number), (yyvsp[-8]._number), (yyvsp[-7]._number))); } break; case 127: -#line 1579 "parser.yxx" +#line 1565 "parser.yxx" { - if (yyvsp[-2]._egg != (EggVertexPool *)NULL) { - EggVertexPool *pool = DCAST(EggVertexPool, yyvsp[-2]._egg); + egg_stack.back()->as_transform()->add_matrix4 + (LMatrix4d((yyvsp[-15]._number), (yyvsp[-14]._number), (yyvsp[-13]._number), (yyvsp[-12]._number), + (yyvsp[-11]._number), (yyvsp[-10]._number), (yyvsp[-9]._number), (yyvsp[-8]._number), + (yyvsp[-7]._number), (yyvsp[-6]._number), (yyvsp[-5]._number), (yyvsp[-4]._number), + (yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number), (yyvsp[0]._number))); +} + break; + + case 128: +#line 1584 "parser.yxx" + { + if ((yyvsp[-2]._egg) != (EggVertexPool *)NULL) { + EggVertexPool *pool = DCAST(EggVertexPool, (yyvsp[-2]._egg)); EggGroup *group = DCAST(EggGroup, egg_stack.back()); - PTA_double nums = yyvsp[-6]._number_list; - double membership = yyvsp[-5]._number; + PTA_double nums = (yyvsp[-6]._number_list); + double membership = (yyvsp[-5]._number); for (int i = 0; i < (int)nums.size(); i++) { int index = (int)nums[i]; @@ -3286,19 +3338,19 @@ yyreduce: } break; - case 128: -#line 1612 "parser.yxx" + case 129: +#line 1617 "parser.yxx" { - yyval._number = 1.0; + (yyval._number) = 1.0; } break; - case 129: -#line 1616 "parser.yxx" + case 130: +#line 1621 "parser.yxx" { - string name = yyvsp[-3]._string; - double value = yyvsp[-1]._number; - double result = yyvsp[-5]._number; + string name = (yyvsp[-3]._string); + double value = (yyvsp[-1]._number); + double result = (yyvsp[-5]._number); if (cmp_nocase_uh(name, "membership") == 0) { result = value; @@ -3306,15 +3358,7 @@ yyreduce: eggyywarning("Unknown group vertex scalar " + name); } - yyval._number = result; -} - break; - - case 131: -#line 1653 "parser.yxx" - { - EggGroup *group = DCAST(EggGroup, egg_stack.back()); - group->set_lod(EggSwitchConditionDistance(yyvsp[-8]._number, yyvsp[-7]._number, LPoint3d(yyvsp[-4]._number, yyvsp[-3]._number, yyvsp[-2]._number))); + (yyval._number) = result; } break; @@ -3322,123 +3366,131 @@ yyreduce: #line 1658 "parser.yxx" { EggGroup *group = DCAST(EggGroup, egg_stack.back()); - group->set_lod(EggSwitchConditionDistance(yyvsp[-9]._number, yyvsp[-8]._number, LPoint3d(yyvsp[-4]._number, yyvsp[-3]._number, yyvsp[-2]._number), yyvsp[-7]._number)); + group->set_lod(EggSwitchConditionDistance((yyvsp[-8]._number), (yyvsp[-7]._number), LPoint3d((yyvsp[-4]._number), (yyvsp[-3]._number), (yyvsp[-2]._number)))); } break; case 133: -#line 1675 "parser.yxx" +#line 1663 "parser.yxx" { - egg_stack.push_back(new EggPolygon(yyvsp[0]._string)); + EggGroup *group = DCAST(EggGroup, egg_stack.back()); + group->set_lod(EggSwitchConditionDistance((yyvsp[-9]._number), (yyvsp[-8]._number), LPoint3d((yyvsp[-4]._number), (yyvsp[-3]._number), (yyvsp[-2]._number)), (yyvsp[-7]._number))); } break; case 134: -#line 1679 "parser.yxx" +#line 1680 "parser.yxx" { - yyval._egg = egg_stack.back(); - egg_stack.pop_back(); + egg_stack.push_back(new EggPolygon((yyvsp[0]._string))); } break; case 135: -#line 1694 "parser.yxx" +#line 1684 "parser.yxx" { - egg_stack.push_back(new EggTriangleFan(yyvsp[0]._string)); + (yyval._egg) = egg_stack.back(); + egg_stack.pop_back(); } break; case 136: -#line 1698 "parser.yxx" +#line 1699 "parser.yxx" { - yyval._egg = egg_stack.back(); - egg_stack.pop_back(); + egg_stack.push_back(new EggTriangleFan((yyvsp[0]._string))); } break; case 137: -#line 1713 "parser.yxx" +#line 1703 "parser.yxx" { - egg_stack.push_back(new EggTriangleStrip(yyvsp[0]._string)); + (yyval._egg) = egg_stack.back(); + egg_stack.pop_back(); } break; case 138: -#line 1717 "parser.yxx" +#line 1718 "parser.yxx" { - yyval._egg = egg_stack.back(); - egg_stack.pop_back(); + egg_stack.push_back(new EggTriangleStrip((yyvsp[0]._string))); } break; case 139: -#line 1732 "parser.yxx" +#line 1722 "parser.yxx" { - egg_stack.push_back(new EggPoint(yyvsp[0]._string)); + (yyval._egg) = egg_stack.back(); + egg_stack.pop_back(); } break; case 140: -#line 1736 "parser.yxx" +#line 1737 "parser.yxx" { - yyval._egg = egg_stack.back(); - egg_stack.pop_back(); + egg_stack.push_back(new EggPoint((yyvsp[0]._string))); } break; case 141: -#line 1751 "parser.yxx" +#line 1741 "parser.yxx" { - egg_stack.push_back(new EggLine(yyvsp[0]._string)); + (yyval._egg) = egg_stack.back(); + egg_stack.pop_back(); } break; case 142: -#line 1755 "parser.yxx" +#line 1756 "parser.yxx" { - yyval._egg = egg_stack.back(); - egg_stack.pop_back(); + egg_stack.push_back(new EggLine((yyvsp[0]._string))); } break; case 143: -#line 1770 "parser.yxx" +#line 1760 "parser.yxx" { - egg_stack.push_back(new EggNurbsSurface(yyvsp[0]._string)); + (yyval._egg) = egg_stack.back(); + egg_stack.pop_back(); } break; case 144: -#line 1774 "parser.yxx" +#line 1775 "parser.yxx" { - yyval._egg = egg_stack.back(); - egg_stack.pop_back(); + egg_stack.push_back(new EggNurbsSurface((yyvsp[0]._string))); } break; case 145: -#line 1789 "parser.yxx" +#line 1779 "parser.yxx" { - egg_stack.push_back(new EggNurbsCurve(yyvsp[0]._string)); -} - break; - - case 146: -#line 1793 "parser.yxx" - { - yyval._egg = egg_stack.back(); + (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); } break; - case 151: -#line 1823 "parser.yxx" + case 146: +#line 1794 "parser.yxx" + { + egg_stack.push_back(new EggNurbsCurve((yyvsp[0]._string))); +} + break; + + case 147: +#line 1798 "parser.yxx" + { + (yyval._egg) = egg_stack.back(); + egg_stack.pop_back(); +} + break; + + case 152: +#line 1828 "parser.yxx" { if (!egg_stack.back()->is_of_type(EggCompositePrimitive::get_class_type())) { eggyyerror("Not a composite primitive; components are not allowed here."); } else { PT(EggCompositePrimitive) comp = DCAST(EggCompositePrimitive, egg_stack.back()); - if (yyvsp[-1]._number < 0 || yyvsp[-1]._number >= comp->get_num_components()) { + if ((yyvsp[-1]._number) < 0 || (yyvsp[-1]._number) >= comp->get_num_components()) { eggyyerror("Invalid component number"); } } @@ -3448,23 +3500,23 @@ yyreduce: } break; - case 152: -#line 1837 "parser.yxx" + case 153: +#line 1842 "parser.yxx" { PT(EggPrimitive) prim = DCAST(EggPrimitive, egg_stack.back()); egg_stack.pop_back(); PT(EggCompositePrimitive) comp = DCAST(EggCompositePrimitive, egg_stack.back()); - comp->set_component((int)yyvsp[-4]._number, prim); + comp->set_component((int)(yyvsp[-4]._number), prim); } break; - case 160: -#line 1851 "parser.yxx" + case 161: +#line 1856 "parser.yxx" { EggPrimitive *primitive = DCAST(EggPrimitive, egg_stack.back()); - string name = yyvsp[-3]._string; - double value = yyvsp[-1]._number; - string strval = yyvsp[-1]._string; + string name = (yyvsp[-3]._string); + double value = (yyvsp[-1]._number); + string strval = (yyvsp[-1]._string); if (cmp_nocase_uh(name, "alpha") == 0) { EggRenderMode::AlphaMode a = EggRenderMode::string_alpha_mode(strval); @@ -3524,22 +3576,22 @@ yyreduce: } break; - case 172: -#line 1935 "parser.yxx" + case 173: +#line 1940 "parser.yxx" { - EggNurbsCurve *curve = DCAST(EggNurbsCurve, yyvsp[0]._egg); + EggNurbsCurve *curve = DCAST(EggNurbsCurve, (yyvsp[0]._egg)); EggNurbsSurface *nurbs = DCAST(EggNurbsSurface, egg_stack.back()); nurbs->_curves_on_surface.push_back(curve); } break; - case 174: -#line 1942 "parser.yxx" + case 175: +#line 1947 "parser.yxx" { EggNurbsSurface *primitive = DCAST(EggNurbsSurface, egg_stack.back()); - string name = yyvsp[-3]._string; - double value = yyvsp[-1]._number; - string strval = yyvsp[-1]._string; + string name = (yyvsp[-3]._string); + double value = (yyvsp[-1]._number); + string strval = (yyvsp[-1]._string); if (cmp_nocase_uh(name, "alpha") == 0) { EggRenderMode::AlphaMode a = EggRenderMode::string_alpha_mode(strval); @@ -3589,13 +3641,13 @@ yyreduce: } break; - case 185: -#line 2016 "parser.yxx" + case 186: +#line 2021 "parser.yxx" { EggNurbsCurve *primitive = DCAST(EggNurbsCurve, egg_stack.back()); - string name = yyvsp[-3]._string; - double value = yyvsp[-1]._number; - string strval = yyvsp[-1]._string; + string name = (yyvsp[-3]._string); + double value = (yyvsp[-1]._number); + string strval = (yyvsp[-1]._string); if (cmp_nocase_uh(name, "alpha") == 0) { EggRenderMode::AlphaMode a = EggRenderMode::string_alpha_mode(strval); @@ -3651,23 +3703,23 @@ yyreduce: } break; - case 186: -#line 2085 "parser.yxx" + case 187: +#line 2090 "parser.yxx" { - if (yyvsp[0]._egg != (EggTexture *)NULL) { - EggTexture *texture = DCAST(EggTexture, yyvsp[0]._egg); + if ((yyvsp[0]._egg) != (EggTexture *)NULL) { + EggTexture *texture = DCAST(EggTexture, (yyvsp[0]._egg)); DCAST(EggPrimitive, egg_stack.back())->add_texture(texture); } } break; - case 187: -#line 2102 "parser.yxx" + case 188: +#line 2107 "parser.yxx" { EggTexture *texture = NULL; // Defining a texture on-the-fly. - Filename filename = yyvsp[0]._string; + Filename filename = (yyvsp[0]._string); string tref_name = filename.get_basename(); Textures::iterator vpi = textures.find(tref_name); @@ -3694,90 +3746,90 @@ yyreduce: } break; - case 188: -#line 2142 "parser.yxx" + case 189: +#line 2147 "parser.yxx" { - if (yyvsp[0]._egg != (EggMaterial *)NULL) { - EggMaterial *material = DCAST(EggMaterial, yyvsp[0]._egg); + if ((yyvsp[0]._egg) != (EggMaterial *)NULL) { + EggMaterial *material = DCAST(EggMaterial, (yyvsp[0]._egg)); DCAST(EggPrimitive, egg_stack.back())->set_material(material); } } break; - case 189: -#line 2159 "parser.yxx" - { - DCAST(EggPrimitive, egg_stack.back())->set_normal(Normald(yyvsp[-2]._number, yyvsp[-1]._number, yyvsp[0]._number)); -} - break; - case 190: -#line 2163 "parser.yxx" +#line 2164 "parser.yxx" { - bool inserted = DCAST(EggPrimitive, egg_stack.back())->_dnormals. - insert(EggMorphNormal(yyvsp[-5]._string, LVector3d(yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number))).second; - if (!inserted) { - eggyywarning("Ignoring repeated morph name " + yyvsp[-5]._string); - } + DCAST(EggPrimitive, egg_stack.back())->set_normal(Normald((yyvsp[-2]._number), (yyvsp[-1]._number), (yyvsp[0]._number))); } break; case 191: -#line 2171 "parser.yxx" +#line 2168 "parser.yxx" { bool inserted = DCAST(EggPrimitive, egg_stack.back())->_dnormals. - insert(EggMorphNormal(yyvsp[-4]._string, LVector3d(yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number))).second; + insert(EggMorphNormal((yyvsp[-5]._string), LVector3d((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number)))).second; if (!inserted) { - eggyywarning("Ignoring repeated morph name " + yyvsp[-4]._string); + eggyywarning("Ignoring repeated morph name " + (yyvsp[-5]._string)); } } break; case 192: -#line 2189 "parser.yxx" +#line 2176 "parser.yxx" { - DCAST(EggPrimitive, egg_stack.back())->set_color(Colorf(yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number, yyvsp[0]._number)); -} - break; - - case 193: -#line 2193 "parser.yxx" - { - bool inserted = DCAST(EggPrimitive, egg_stack.back())->_drgbas. - insert(EggMorphColor(yyvsp[-6]._string, LVector4f(yyvsp[-4]._number, yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number))).second; + bool inserted = DCAST(EggPrimitive, egg_stack.back())->_dnormals. + insert(EggMorphNormal((yyvsp[-4]._string), LVector3d((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number)))).second; if (!inserted) { - eggyywarning("Ignoring repeated morph name " + yyvsp[-6]._string); + eggyywarning("Ignoring repeated morph name " + (yyvsp[-4]._string)); } } break; + case 193: +#line 2194 "parser.yxx" + { + DCAST(EggPrimitive, egg_stack.back())->set_color(Colorf((yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number), (yyvsp[0]._number))); +} + break; + case 194: -#line 2201 "parser.yxx" +#line 2198 "parser.yxx" { bool inserted = DCAST(EggPrimitive, egg_stack.back())->_drgbas. - insert(EggMorphColor(yyvsp[-5]._string, LVector4f(yyvsp[-4]._number, yyvsp[-3]._number, yyvsp[-2]._number, yyvsp[-1]._number))).second; + insert(EggMorphColor((yyvsp[-6]._string), LVector4f((yyvsp[-4]._number), (yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number)))).second; if (!inserted) { - eggyywarning("Ignoring repeated morph name " + yyvsp[-5]._string); + eggyywarning("Ignoring repeated morph name " + (yyvsp[-6]._string)); } } break; case 195: -#line 2219 "parser.yxx" +#line 2206 "parser.yxx" { - EggPrimitive *primitive = DCAST(EggPrimitive, egg_stack.back()); - int value = (int)yyvsp[0]._number; - primitive->set_bface_flag(value!=0); + bool inserted = DCAST(EggPrimitive, egg_stack.back())->_drgbas. + insert(EggMorphColor((yyvsp[-5]._string), LVector4f((yyvsp[-4]._number), (yyvsp[-3]._number), (yyvsp[-2]._number), (yyvsp[-1]._number)))).second; + if (!inserted) { + eggyywarning("Ignoring repeated morph name " + (yyvsp[-5]._string)); + } } break; case 196: -#line 2235 "parser.yxx" +#line 2224 "parser.yxx" { - if (yyvsp[-2]._egg != (EggVertexPool *)NULL) { - EggVertexPool *pool = DCAST(EggVertexPool, yyvsp[-2]._egg); + EggPrimitive *primitive = DCAST(EggPrimitive, egg_stack.back()); + int value = (int)(yyvsp[0]._number); + primitive->set_bface_flag(value!=0); +} + break; + + case 197: +#line 2240 "parser.yxx" + { + if ((yyvsp[-2]._egg) != (EggVertexPool *)NULL) { + EggVertexPool *pool = DCAST(EggVertexPool, (yyvsp[-2]._egg)); EggPrimitive *prim = DCAST(EggPrimitive, egg_stack.back()); - PTA_double nums = yyvsp[-5]._number_list; + PTA_double nums = (yyvsp[-5]._number_list); for (int i = 0; i < (int)nums.size(); i++) { int index = (int)nums[i]; @@ -3795,22 +3847,22 @@ yyreduce: } break; - case 197: -#line 2266 "parser.yxx" + case 198: +#line 2271 "parser.yxx" { EggNurbsSurface *nurbs = DCAST(EggNurbsSurface, egg_stack.back()); - int u_order = (int)yyvsp[-1]._number; - int v_order = (int)yyvsp[0]._number; + int u_order = (int)(yyvsp[-1]._number); + int v_order = (int)(yyvsp[0]._number); nurbs->set_u_order(u_order); nurbs->set_v_order(v_order); } break; - case 198: -#line 2284 "parser.yxx" + case 199: +#line 2289 "parser.yxx" { EggNurbsSurface *nurbs = DCAST(EggNurbsSurface, egg_stack.back()); - PTA_double nums = yyvsp[0]._number_list; + PTA_double nums = (yyvsp[0]._number_list); nurbs->set_num_u_knots(nums.size()); for (int i = 0; i < (int)nums.size(); i++) { @@ -3819,11 +3871,11 @@ yyreduce: } break; - case 199: -#line 2304 "parser.yxx" + case 200: +#line 2309 "parser.yxx" { EggNurbsSurface *nurbs = DCAST(EggNurbsSurface, egg_stack.back()); - PTA_double nums = yyvsp[0]._number_list; + PTA_double nums = (yyvsp[0]._number_list); nurbs->set_num_v_knots(nums.size()); for (int i = 0; i < (int)nums.size(); i++) { @@ -3832,16 +3884,16 @@ yyreduce: } break; - case 200: -#line 2324 "parser.yxx" + case 201: +#line 2329 "parser.yxx" { EggNurbsSurface *nurbs = DCAST(EggNurbsSurface, egg_stack.back()); nurbs->_trims.push_back(EggNurbsSurface::Trim()); } break; - case 202: -#line 2340 "parser.yxx" + case 203: +#line 2345 "parser.yxx" { EggNurbsSurface *nurbs = DCAST(EggNurbsSurface, egg_stack.back()); nassertr(!nurbs->_trims.empty(), 0); @@ -3849,31 +3901,31 @@ yyreduce: } break; - case 203: -#line 2346 "parser.yxx" + case 204: +#line 2351 "parser.yxx" { EggNurbsSurface *nurbs = DCAST(EggNurbsSurface, egg_stack.back()); nassertr(!nurbs->_trims.empty(), 0); nassertr(!nurbs->_trims.back().empty(), 0); - EggNurbsCurve *curve = DCAST(EggNurbsCurve, yyvsp[0]._egg); + EggNurbsCurve *curve = DCAST(EggNurbsCurve, (yyvsp[0]._egg)); nurbs->_trims.back().back().push_back(curve); } break; - case 204: -#line 2365 "parser.yxx" + case 205: +#line 2370 "parser.yxx" { EggNurbsCurve *nurbs = DCAST(EggNurbsCurve, egg_stack.back()); - int order = (int)yyvsp[0]._number; + int order = (int)(yyvsp[0]._number); nurbs->set_order(order); } break; - case 205: -#line 2381 "parser.yxx" + case 206: +#line 2386 "parser.yxx" { EggNurbsCurve *nurbs = DCAST(EggNurbsCurve, egg_stack.back()); - PTA_double nums = yyvsp[0]._number_list; + PTA_double nums = (yyvsp[0]._number_list); nurbs->set_num_knots(nums.size()); for (int i = 0; i < (int)nums.size(); i++) { @@ -3882,97 +3934,97 @@ yyreduce: } break; - case 206: -#line 2402 "parser.yxx" + case 207: +#line 2407 "parser.yxx" { - EggTable *table = new EggTable(yyvsp[0]._string); + EggTable *table = new EggTable((yyvsp[0]._string)); table->set_table_type(EggTable::TT_table); egg_stack.push_back(table); } break; - case 207: -#line 2408 "parser.yxx" + case 208: +#line 2413 "parser.yxx" { - yyval._egg = egg_stack.back(); + (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); } break; - case 208: -#line 2424 "parser.yxx" + case 209: +#line 2429 "parser.yxx" { - EggTable *table = new EggTable(yyvsp[0]._string); + EggTable *table = new EggTable((yyvsp[0]._string)); table->set_table_type(EggTable::TT_bundle); egg_stack.push_back(table); } break; - case 209: -#line 2430 "parser.yxx" + case 210: +#line 2435 "parser.yxx" { - yyval._egg = egg_stack.back(); + (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); } break; - case 211: -#line 2447 "parser.yxx" - { - DCAST(EggTable, egg_stack.back())->add_child(DCAST(EggNode, yyvsp[0]._egg)); -} - break; - case 212: -#line 2451 "parser.yxx" +#line 2452 "parser.yxx" { - DCAST(EggTable, egg_stack.back())->add_child(DCAST(EggNode, yyvsp[0]._egg)); + DCAST(EggTable, egg_stack.back())->add_child(DCAST(EggNode, (yyvsp[0]._egg))); } break; case 213: -#line 2455 "parser.yxx" +#line 2456 "parser.yxx" { - DCAST(EggTable, egg_stack.back())->add_child(DCAST(EggNode, yyvsp[0]._egg)); + DCAST(EggTable, egg_stack.back())->add_child(DCAST(EggNode, (yyvsp[0]._egg))); } break; case 214: -#line 2459 "parser.yxx" +#line 2460 "parser.yxx" { - DCAST(EggTable, egg_stack.back())->add_child(DCAST(EggNode, yyvsp[0]._egg)); + DCAST(EggTable, egg_stack.back())->add_child(DCAST(EggNode, (yyvsp[0]._egg))); } break; case 215: -#line 2463 "parser.yxx" +#line 2464 "parser.yxx" { - DCAST(EggTable, egg_stack.back())->add_child(DCAST(EggNode, yyvsp[0]._egg)); + DCAST(EggTable, egg_stack.back())->add_child(DCAST(EggNode, (yyvsp[0]._egg))); } break; case 216: -#line 2478 "parser.yxx" +#line 2468 "parser.yxx" { - EggSAnimData *anim_data = new EggSAnimData(yyvsp[0]._string); - egg_stack.push_back(anim_data); + DCAST(EggTable, egg_stack.back())->add_child(DCAST(EggNode, (yyvsp[0]._egg))); } break; case 217: #line 2483 "parser.yxx" { - yyval._egg = egg_stack.back(); + EggSAnimData *anim_data = new EggSAnimData((yyvsp[0]._string)); + egg_stack.push_back(anim_data); +} + break; + + case 218: +#line 2488 "parser.yxx" + { + (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); } break; - case 219: -#line 2500 "parser.yxx" + case 220: +#line 2505 "parser.yxx" { EggSAnimData *anim_data = DCAST(EggSAnimData, egg_stack.back()); - string name = yyvsp[-3]._string; - double value = yyvsp[-1]._number; + string name = (yyvsp[-3]._string); + double value = (yyvsp[-1]._number); if (cmp_nocase_uh(name, "fps") == 0) { anim_data->set_fps(value); @@ -3982,36 +4034,36 @@ yyreduce: } break; - case 220: -#line 2512 "parser.yxx" - { - DCAST(EggSAnimData, egg_stack.back())->set_data(yyvsp[-1]._number_list); -} - break; - case 221: -#line 2526 "parser.yxx" +#line 2517 "parser.yxx" { - EggXfmAnimData *anim_data = new EggXfmAnimData(yyvsp[0]._string); - egg_stack.push_back(anim_data); + DCAST(EggSAnimData, egg_stack.back())->set_data((yyvsp[-1]._number_list)); } break; case 222: #line 2531 "parser.yxx" { - yyval._egg = egg_stack.back(); + EggXfmAnimData *anim_data = new EggXfmAnimData((yyvsp[0]._string)); + egg_stack.push_back(anim_data); +} + break; + + case 223: +#line 2536 "parser.yxx" + { + (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); } break; - case 224: -#line 2548 "parser.yxx" + case 225: +#line 2553 "parser.yxx" { EggXfmAnimData *anim_data = DCAST(EggXfmAnimData, egg_stack.back()); - string name = yyvsp[-3]._string; - double value = yyvsp[-1]._number; - string strval = yyvsp[-1]._string; + string name = (yyvsp[-3]._string); + double value = (yyvsp[-1]._number); + string strval = (yyvsp[-1]._string); if (cmp_nocase_uh(name, "fps") == 0) { anim_data->set_fps(value); @@ -4025,36 +4077,36 @@ yyreduce: } break; - case 225: -#line 2565 "parser.yxx" - { - DCAST(EggXfmAnimData, egg_stack.back())->set_data(yyvsp[-1]._number_list); -} - break; - case 226: -#line 2579 "parser.yxx" +#line 2570 "parser.yxx" { - EggXfmSAnim *anim_group = new EggXfmSAnim(yyvsp[0]._string); - egg_stack.push_back(anim_group); + DCAST(EggXfmAnimData, egg_stack.back())->set_data((yyvsp[-1]._number_list)); } break; case 227: #line 2584 "parser.yxx" { - yyval._egg = egg_stack.back(); + EggXfmSAnim *anim_group = new EggXfmSAnim((yyvsp[0]._string)); + egg_stack.push_back(anim_group); +} + break; + + case 228: +#line 2589 "parser.yxx" + { + (yyval._egg) = egg_stack.back(); egg_stack.pop_back(); } break; - case 229: -#line 2601 "parser.yxx" + case 230: +#line 2606 "parser.yxx" { EggXfmSAnim *anim_group = DCAST(EggXfmSAnim, egg_stack.back()); - string name = yyvsp[-3]._string; - double value = yyvsp[-1]._number; - string strval = yyvsp[-1]._string; + string name = (yyvsp[-3]._string); + double value = (yyvsp[-1]._number); + string strval = (yyvsp[-1]._string); if (cmp_nocase_uh(name, "fps") == 0) { anim_group->set_fps(value); @@ -4066,73 +4118,73 @@ yyreduce: } break; - case 230: -#line 2616 "parser.yxx" - { - DCAST(EggXfmSAnim, egg_stack.back())->add_child(DCAST(EggNode, yyvsp[0]._egg)); -} - break; - case 231: -#line 2631 "parser.yxx" +#line 2621 "parser.yxx" { - yyval._number_list = PTA_double::empty_array(0); + DCAST(EggXfmSAnim, egg_stack.back())->add_child(DCAST(EggNode, (yyvsp[0]._egg))); } break; case 232: -#line 2635 "parser.yxx" +#line 2636 "parser.yxx" { - yyval._number_list.push_back((double)yyvsp[0]._number); + (yyval._number_list) = PTA_double::empty_array(0); } break; case 233: -#line 2649 "parser.yxx" +#line 2640 "parser.yxx" { - yyval._number_list = PTA_double::empty_array(0); + (yyval._number_list).push_back((double)(yyvsp[0]._number)); } break; case 234: -#line 2653 "parser.yxx" +#line 2654 "parser.yxx" { - yyval._number_list.push_back(yyvsp[0]._number); + (yyval._number_list) = PTA_double::empty_array(0); } break; case 235: -#line 2667 "parser.yxx" +#line 2658 "parser.yxx" { - string name = yyvsp[0]._string; - Textures::iterator vpi = textures.find(name); - if (vpi == textures.end()) { - eggyyerror("Unknown texture " + name); - yyval._egg = PT(EggObject)(); - } else { - yyval._egg = (*vpi).second; - } + (yyval._number_list).push_back((yyvsp[0]._number)); } break; case 236: -#line 2688 "parser.yxx" +#line 2672 "parser.yxx" { - string name = yyvsp[0]._string; - Materials::iterator vpi = materials.find(name); - if (vpi == materials.end()) { - eggyyerror("Unknown material " + name); - yyval._egg = PT(EggObject)(); + string name = (yyvsp[0]._string); + Textures::iterator vpi = textures.find(name); + if (vpi == textures.end()) { + eggyyerror("Unknown texture " + name); + (yyval._egg) = PT(EggObject)(); } else { - yyval._egg = (*vpi).second; + (yyval._egg) = (*vpi).second; } } break; case 237: -#line 2709 "parser.yxx" +#line 2693 "parser.yxx" { - string name = yyvsp[0]._string; + string name = (yyvsp[0]._string); + Materials::iterator vpi = materials.find(name); + if (vpi == materials.end()) { + eggyyerror("Unknown material " + name); + (yyval._egg) = PT(EggObject)(); + } else { + (yyval._egg) = (*vpi).second; + } +} + break; + + case 238: +#line 2714 "parser.yxx" + { + string name = (yyvsp[0]._string); VertexPools::iterator vpi = vertex_pools.find(name); if (vpi == vertex_pools.end()) { // This will become a forward reference. @@ -4140,135 +4192,135 @@ yyreduce: // The egg syntax starts counting at 1 by convention. pool->set_highest_index(0); vertex_pools[name] = pool; - yyval._egg = pool; + (yyval._egg) = pool; } else { - yyval._egg = (*vpi).second; + (yyval._egg) = (*vpi).second; } } break; - case 238: -#line 2735 "parser.yxx" + case 239: +#line 2740 "parser.yxx" { eggyyerror("Name required."); - yyval._string = ""; + (yyval._string) = ""; } break; - case 241: -#line 2764 "parser.yxx" + case 242: +#line 2769 "parser.yxx" { eggyyerror("String required."); - yyval._string = ""; + (yyval._string) = ""; } break; - case 243: -#line 2780 "parser.yxx" + case 244: +#line 2785 "parser.yxx" { - yyval._string = ""; -} - break; - - case 245: -#line 2798 "parser.yxx" - { - yyval._string = yyvsp[0]._string; + (yyval._string) = ""; } break; case 246: -#line 2802 "parser.yxx" +#line 2803 "parser.yxx" { - yyval._string = yyvsp[0]._string; + (yyval._string) = (yyvsp[0]._string); } break; - case 248: -#line 2819 "parser.yxx" + case 247: +#line 2807 "parser.yxx" { - yyval._string = ""; + (yyval._string) = (yyvsp[0]._string); } break; case 249: -#line 2823 "parser.yxx" +#line 2824 "parser.yxx" { - yyval._string = yyvsp[0]._string; + (yyval._string) = ""; } break; case 250: -#line 2839 "parser.yxx" +#line 2828 "parser.yxx" { - yyval._string = yyvsp[0]._string; + (yyval._string) = (yyvsp[0]._string); } break; case 251: -#line 2843 "parser.yxx" +#line 2844 "parser.yxx" { - yyval._string = yyvsp[-1]._string + "\n" + yyvsp[0]._string; + (yyval._string) = (yyvsp[0]._string); } break; - case 253: -#line 2858 "parser.yxx" + case 252: +#line 2848 "parser.yxx" { - yyval._number = yyvsp[0]._ulong; + (yyval._string) = (yyvsp[-1]._string) + "\n" + (yyvsp[0]._string); } break; case 254: -#line 2873 "parser.yxx" +#line 2863 "parser.yxx" { - yyval._number = yyvsp[0]._number; - yyval._ulong = (unsigned long)yyvsp[0]._number; - yyval._string = yyvsp[0]._string; + (yyval._number) = (yyvsp[0]._ulong); } break; case 255: -#line 2879 "parser.yxx" +#line 2878 "parser.yxx" { - yyval._number = yyvsp[0]._ulong; - yyval._ulong = yyvsp[0]._ulong; - yyval._string = yyvsp[0]._string; + (yyval._number) = (yyvsp[0]._number); + (yyval._ulong) = (unsigned long)(yyvsp[0]._number); + (yyval._string) = (yyvsp[0]._string); } break; case 256: -#line 2885 "parser.yxx" +#line 2884 "parser.yxx" { - yyval._number = 0.0; - yyval._ulong = 0; - yyval._string = yyvsp[0]._string; + (yyval._number) = (yyvsp[0]._ulong); + (yyval._ulong) = (yyvsp[0]._ulong); + (yyval._string) = (yyvsp[0]._string); } break; case 257: -#line 2902 "parser.yxx" +#line 2890 "parser.yxx" { - int i = (int)yyvsp[0]._number; - if ((double)i != yyvsp[0]._number) { - eggyywarning("Integer expected."); - yyval._number = (double)i; - } + (yyval._number) = 0.0; + (yyval._ulong) = 0; + (yyval._string) = (yyvsp[0]._string); } break; case 258: -#line 2910 "parser.yxx" +#line 2907 "parser.yxx" { - yyval._number = yyvsp[0]._ulong; + int i = (int)(yyvsp[0]._number); + if ((double)i != (yyvsp[0]._number)) { + eggyywarning("Integer expected."); + (yyval._number) = (double)i; + } +} + break; + + case 259: +#line 2915 "parser.yxx" + { + (yyval._number) = (yyvsp[0]._ulong); } break; } -/* Line 999 of yacc.c. */ -#line 4272 "y.tab.c" +/* Line 1037 of yacc.c. */ +#line 4324 "y.tab.c" yyvsp -= yylen; yyssp -= yylen; @@ -4368,38 +4420,57 @@ yyerrlab: if (yyerrstatus == 3) { - /* If just tried and failed to reuse lookahead token after an + /* If just tried and failed to reuse look-ahead token after an error, discard it. */ - /* Return failure if at end of input. */ - if (yychar == YYEOF) + if (yychar <= YYEOF) { - /* Pop the error token. */ - YYPOPSTACK; - /* Pop the rest of the stack. */ - while (yyss < yyssp) - { - YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); - yydestruct (yystos[*yyssp], yyvsp); - YYPOPSTACK; - } - YYABORT; + /* If at end of input, pop the error token, + then the rest of the stack, then return failure. */ + if (yychar == YYEOF) + for (;;) + { + + YYPOPSTACK; + if (yyssp == yyss) + YYABORT; + yydestruct ("Error: popping", + yystos[*yyssp], yyvsp); + } } - - YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc); - yydestruct (yytoken, &yylval); - yychar = YYEMPTY; - + else + { + yydestruct ("Error: discarding", yytoken, &yylval); + yychar = YYEMPTY; + } } - /* Else will try to reuse lookahead token after shifting the error + /* Else will try to reuse look-ahead token after shifting the error token. */ goto yyerrlab1; -/*----------------------------------------------------. -| yyerrlab1 -- error raised explicitly by an action. | -`----------------------------------------------------*/ +/*---------------------------------------------------. +| yyerrorlab -- error raised explicitly by YYERROR. | +`---------------------------------------------------*/ +yyerrorlab: + +#ifdef __GNUC__ + /* Pacify GCC when the user code never invokes YYERROR and the label + yyerrorlab therefore never appears in user code. */ + if (0) + goto yyerrorlab; +#endif + +yyvsp -= yylen; + yyssp -= yylen; + yystate = *yyssp; + goto yyerrlab1; + + +/*-------------------------------------------------------------. +| yyerrlab1 -- common code for both syntax error and YYERROR. | +`-------------------------------------------------------------*/ yyerrlab1: yyerrstatus = 3; /* Each real token shifted decrements this. */ @@ -4421,22 +4492,22 @@ yyerrlab1: if (yyssp == yyss) YYABORT; - YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp); - yydestruct (yystos[yystate], yyvsp); - yyvsp--; - yystate = *--yyssp; + yydestruct ("Error: popping", yystos[yystate], yyvsp); + YYPOPSTACK; + yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); } if (yyn == YYFINAL) YYACCEPT; - YYDPRINTF ((stderr, "Shifting error token, ")); - *++yyvsp = yylval; + /* Shift the error token. */ + YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp); + yystate = yyn; goto yynewstate; @@ -4452,6 +4523,9 @@ yyacceptlab: | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ yyabortlab: + yydestruct ("Error: discarding lookahead", + yytoken, &yylval); + yychar = YYEMPTY; yyresult = 1; goto yyreturn; diff --git a/panda/src/egg/parser.h.prebuilt b/panda/src/egg/parser.h.prebuilt index 3723b8cbf2..8f72f7177e 100644 --- a/panda/src/egg/parser.h.prebuilt +++ b/panda/src/egg/parser.h.prebuilt @@ -1,7 +1,7 @@ -/* A Bison parser, made by GNU Bison 1.875b. */ +/* A Bison parser, made by GNU Bison 2.0. */ /* Skeleton parser for Yacc-like parsing with Bison, - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/panda/src/egg/parser.yxx b/panda/src/egg/parser.yxx index bf531ab05c..b836c6c390 100644 --- a/panda/src/egg/parser.yxx +++ b/panda/src/egg/parser.yxx @@ -622,7 +622,7 @@ texture_body: eggyywarning("Unsupported texture scalar: " + name); } } - | texture_body transform_2d + | texture_body transform ; /* @@ -955,6 +955,10 @@ vertex_uv_body: real real { DCAST(EggVertexUV, egg_stack.back())->set_uv(TexCoordd($1, $2)); +} + | real real real +{ + DCAST(EggVertexUV, egg_stack.back())->set_uvw(LVecBase3d($1, $2, $3)); } | vertex_uv_body TANGENT '{' real real real '}' { @@ -975,15 +979,31 @@ vertex_uv_body: | vertex_uv_body DUV string '{' real real '}' { bool inserted = DCAST(EggVertexUV, egg_stack.back())->_duvs. - insert(EggMorphTexCoord($3, LVector2d($5, $6))).second; + insert(EggMorphTexCoord($3, LVector3d($5, $6, 0.0))).second; if (!inserted) { eggyywarning("Ignoring repeated morph name " + $3); } } - | vertex_uv_body DUV '{' string real real '}' + | vertex_uv_body DUV string '{' real real real '}' { bool inserted = DCAST(EggVertexUV, egg_stack.back())->_duvs. - insert(EggMorphTexCoord($4, LVector2d($5, $6))).second; + insert(EggMorphTexCoord($3, LVector3d($5, $6, $7))).second; + if (!inserted) { + eggyywarning("Ignoring repeated morph name " + $3); + } +} + | vertex_uv_body DUV '{' string real real '}' +{ + bool inserted = DCAST(EggVertexUV, egg_stack.back())->_duvs. + insert(EggMorphTexCoord($4, LVector3d($5, $6, 0.0))).second; + if (!inserted) { + eggyywarning("Ignoring repeated morph name " + $4); + } +} + | vertex_uv_body DUV '{' string real real real '}' +{ + bool inserted = DCAST(EggVertexUV, egg_stack.back())->_duvs. + insert(EggMorphTexCoord($4, LVector3d($5, $6, $7))).second; if (!inserted) { eggyywarning("Ignoring repeated morph name " + $4); } @@ -1343,7 +1363,7 @@ group_body: int value = (int)$4; group->set_texlist_flag(value!=0); } - | group_body transform_3d + | group_body transform | group_body group_vertex_ref | group_body switchcondition | group_body node @@ -1406,91 +1426,144 @@ collide_flags: ; /* - * transform_3d + * transform * - * enter: TOS is EggGroup. - * exit: group's transform matrix has been set. + * enter: TOS is some kind of EggTransform. + * exit: transform matrix has been set. * */ -transform_3d: +transform: TRANSFORM { - DCAST(EggGroup, egg_stack.back())->clear_transform(); + egg_stack.back()->as_transform()->clear_transform(); } - '{' transform_3d_body '}' + '{' transform_body '}' ; /* - * transform_3d_body + * transform_body * - * enter: matrix_3d contains some sensible value. - * exit: matrix_3d has been transformed by the parsed transformation. + * enter: TOS is some kind of EggTransform. + * exit: transform has been filled in. * */ -transform_3d_body: +transform_body: empty - | transform_3d_body translate_3d - | transform_3d_body rotx_3d - | transform_3d_body roty_3d - | transform_3d_body rotz_3d - | transform_3d_body rotate_3d - | transform_3d_body scale_3d - | transform_3d_body matrix4_3d + | transform_body translate2d + | transform_body translate3d + | transform_body rotate2d + | transform_body rotx + | transform_body roty + | transform_body rotz + | transform_body rotate3d + | transform_body scale2d + | transform_body scale3d + | transform_body uniform_scale + | transform_body matrix3 + | transform_body matrix4 ; -translate_3d: TRANSLATE '{' real real real '}' +translate2d: + TRANSLATE '{' real real '}' { - DCAST(EggGroup, egg_stack.back())->add_translate(LVector3d($3, $4, $5)); + egg_stack.back()->as_transform()->add_translate2d(LVector2d($3, $4)); } ; -rotx_3d: ROTX '{' real '}' +translate3d: + TRANSLATE '{' real real real '}' { - DCAST(EggGroup, egg_stack.back())->add_rotx($3); + egg_stack.back()->as_transform()->add_translate3d(LVector3d($3, $4, $5)); } ; -roty_3d: ROTY '{' real '}' +rotate2d: + ROTATE '{' real '}' { - DCAST(EggGroup, egg_stack.back())->add_roty($3); + egg_stack.back()->as_transform()->add_rotate2d($3); } ; -rotz_3d: ROTZ '{' real '}' +rotx: + ROTX '{' real '}' { - DCAST(EggGroup, egg_stack.back())->add_rotz($3); + egg_stack.back()->as_transform()->add_rotx($3); } ; -rotate_3d: ROTATE '{' real real real real '}' +roty: + ROTY '{' real '}' { - DCAST(EggGroup, egg_stack.back())->add_rotate($3, LVector3d($4, $5, $6)); + egg_stack.back()->as_transform()->add_roty($3); } ; -scale_3d: SCALE '{' real real real '}' +rotz: + ROTZ '{' real '}' { - DCAST(EggGroup, egg_stack.back())->add_scale(LVecBase3d($3, $4, $5)); -} - | SCALE '{' real '}' -{ - DCAST(EggGroup, egg_stack.back())->add_uniform_scale($3); + egg_stack.back()->as_transform()->add_rotz($3); } ; -matrix4_3d: - MATRIX4 '{' matrix4_3d_body '}' +rotate3d: + ROTATE '{' real real real real '}' +{ + egg_stack.back()->as_transform()->add_rotate3d($3, LVector3d($4, $5, $6)); +} ; -matrix4_3d_body: +scale2d: + SCALE '{' real real '}' +{ + egg_stack.back()->as_transform()->add_scale2d(LVecBase2d($3, $4)); +} + ; + +scale3d: + SCALE '{' real real real '}' +{ + egg_stack.back()->as_transform()->add_scale3d(LVecBase3d($3, $4, $5)); +} + ; + +uniform_scale: + SCALE '{' real '}' +{ + egg_stack.back()->as_transform()->add_uniform_scale($3); +} + ; + +matrix3: + MATRIX3 '{' matrix3_body '}' + ; + +matrix3_body: empty | real real real real real real real real real real real real real real real real { - DCAST(EggGroup, egg_stack.back())->add_matrix + egg_stack.back()->as_transform()->add_matrix3 + (LMatrix3d($1, $2, $3, + $4, $5, $6, + $7, $8, $9)); +} + ; + +matrix4: + MATRIX4 '{' matrix4_body '}' + ; + +matrix4_body: + empty + | real real real real + real real real real + real real real real + real real real real +{ + egg_stack.back()->as_transform()->add_matrix4 (LMatrix4d($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, @@ -1499,74 +1572,6 @@ matrix4_3d_body: ; -/* - * transform_2d - * - * enter: TOS is EggTexture. - * exit: texture's transform matrix has been set. - * - */ -transform_2d: - TRANSFORM -{ - matrix_2d = LMatrix3d::ident_mat(); -} - '{' transform_2d_body '}' -{ - DCAST(EggTexture, egg_stack.back())->set_transform(matrix_2d); -} - ; - - -/* - * transform_2d_body - * - * enter: matrix contains some sensible value. - * exit: matrix has been transformed by the parsed transformation. - * - */ -transform_2d_body: - empty - | transform_2d_body matrix3_2d - | transform_2d_body translate_2d - | transform_2d_body rotate_2d - | transform_2d_body scale_2d - ; - -translate_2d: TRANSLATE '{' real real '}' -{ - matrix_2d *= LMatrix3d::translate_mat($3, $4); -} - ; - -rotate_2d: ROTATE '{' real '}' -{ - matrix_2d *= LMatrix3d::rotate_mat($3); -} - ; - -scale_2d: SCALE '{' real real '}' -{ - matrix_2d *= LMatrix3d::scale_mat($3, $4); -} - ; - -matrix3_2d: MATRIX3 '{' matrix3_2d_body '}' - ; - -matrix3_2d_body: - empty - | real real real - real real real - real real real -{ - matrix_2d *= LMatrix3d($1, $2, $3, - $4, $5, $6, - $7, $8, $9); -} - ; - - /* * group_vertex_ref * diff --git a/panda/src/egg2pg/eggLoader.cxx b/panda/src/egg2pg/eggLoader.cxx index 2ea3d70641..820b9217e1 100644 --- a/panda/src/egg2pg/eggLoader.cxx +++ b/panda/src/egg2pg/eggLoader.cxx @@ -391,6 +391,126 @@ make_polyset(EggBin *egg_bin, PandaNode *parent, const LMatrix4d *transform, } } +//////////////////////////////////////////////////////////////////// +// Function: EggLoader::make_transform +// Access: Public, Static +// Description: Creates a TransformState object corresponding to the +// indicated EggTransform. +//////////////////////////////////////////////////////////////////// +CPT(TransformState) EggLoader:: +make_transform(const EggTransform *egg_transform) { + // We'll build up the transform componentwise, so we preserve any + // componentwise properties of the egg transform. + + CPT(TransformState) ts = TransformState::make_identity(); + int num_components = egg_transform->get_num_components(); + for (int i = 0; i < num_components; i++) { + switch (egg_transform->get_component_type(i)) { + case EggTransform::CT_translate2d: + { + LVecBase2f trans2d(LCAST(float, egg_transform->get_component_vec2(i))); + LVecBase3f trans3d(trans2d[0], trans2d[1], 0.0f); + ts = TransformState::make_pos(trans3d)->compose(ts); + } + break; + + case EggTransform::CT_translate3d: + { + LVecBase3f trans3d(LCAST(float, egg_transform->get_component_vec3(i))); + ts = TransformState::make_pos(trans3d)->compose(ts); + } + break; + + case EggTransform::CT_rotate2d: + { + LRotationf rot(LVector3f(0.0f, 0.0f, 1.0f), + (float)egg_transform->get_component_number(i)); + ts = TransformState::make_quat(rot)->compose(ts); + } + break; + + case EggTransform::CT_rotx: + { + LRotationf rot(LVector3f(1.0f, 0.0f, 0.0f), + (float)egg_transform->get_component_number(i)); + ts = TransformState::make_quat(rot)->compose(ts); + } + break; + + case EggTransform::CT_roty: + { + LRotationf rot(LVector3f(0.0f, 1.0f, 0.0f), + (float)egg_transform->get_component_number(i)); + ts = TransformState::make_quat(rot)->compose(ts); + } + break; + + case EggTransform::CT_rotz: + { + LRotationf rot(LVector3f(0.0f, 0.0f, 1.0f), + (float)egg_transform->get_component_number(i)); + ts = TransformState::make_quat(rot)->compose(ts); + } + break; + + case EggTransform::CT_rotate3d: + { + LRotationf rot(LCAST(float, egg_transform->get_component_vec3(i)), + (float)egg_transform->get_component_number(i)); + ts = TransformState::make_quat(rot)->compose(ts); + } + break; + + case EggTransform::CT_scale2d: + { + LVecBase2f scale2d(LCAST(float, egg_transform->get_component_vec2(i))); + LVecBase3f scale3d(scale2d[0], scale2d[1], 1.0f); + ts = TransformState::make_scale(scale3d)->compose(ts); + } + break; + + case EggTransform::CT_scale3d: + { + LVecBase3f scale3d(LCAST(float, egg_transform->get_component_vec3(i))); + ts = TransformState::make_scale(scale3d)->compose(ts); + } + break; + + case EggTransform::CT_uniform_scale: + { + float scale = (float)egg_transform->get_component_number(i); + ts = TransformState::make_scale(scale)->compose(ts); + } + break; + + case EggTransform::CT_matrix3: + { + LMatrix3f m(LCAST(float, egg_transform->get_component_mat3(i))); + LMatrix4f mat4(m(0, 0), m(0, 1), 0.0, m(0, 2), + m(1, 0), m(1, 1), 0.0, m(1, 2), + 0.0, 0.0, 1.0, 0.0, + m(2, 0), m(2, 1), 0.0, m(2, 2)); + + ts = TransformState::make_mat(mat4)->compose(ts); + } + break; + + case EggTransform::CT_matrix4: + { + LMatrix4f mat4(LCAST(float, egg_transform->get_component_mat4(i))); + ts = TransformState::make_mat(mat4)->compose(ts); + } + break; + + case EggTransform::CT_invalid: + nassertr(false, ts); + break; + } + } + + return ts; +} + //////////////////////////////////////////////////////////////////// // Function: EggLoader::show_normals // Access: Private @@ -1183,8 +1303,7 @@ make_texture_stage(const EggTexture *egg_tex) { } - if (egg_tex->has_uv_name() && !egg_tex->get_uv_name().empty() && - egg_tex->get_uv_name() != string("default")) { + if (egg_tex->has_uv_name()) { CPT(InternalName) name = InternalName::get_texcoord_name(egg_tex->get_uv_name()); stage->set_texcoord_name(name); @@ -1725,23 +1844,26 @@ make_vertex_data(const EggRenderState *render_state, Geom::NT_packed_dabc, Geom::C_color); } - vector_string uv_names, tbn_names; - vertex_pool->get_uv_names(uv_names, tbn_names); + vector_string uv_names, uvw_names, tbn_names; + vertex_pool->get_uv_names(uv_names, uvw_names, tbn_names); vector_string::const_iterator ni; for (ni = uv_names.begin(); ni != uv_names.end(); ++ni) { string name = (*ni); - if (name == "default") { - name = string(); - } + PT(InternalName) iname = InternalName::get_texcoord_name(name); - array_format->add_column - (iname, 2, Geom::NT_float32, Geom::C_texcoord); + + if (find(uvw_names.begin(), uvw_names.end(), name) != uvw_names.end()) { + // This one actually represents 3-d texture coordinates. + array_format->add_column + (iname, 3, Geom::NT_float32, Geom::C_texcoord); + } else { + array_format->add_column + (iname, 2, Geom::NT_float32, Geom::C_texcoord); + } } for (ni = tbn_names.begin(); ni != tbn_names.end(); ++ni) { string name = (*ni); - if (name == "default") { - name = string(); - } + PT(InternalName) iname = InternalName::get_tangent_name(name); array_format->add_column (iname, 3, Geom::NT_float32, Geom::C_vector); @@ -1807,16 +1929,14 @@ make_vertex_data(const EggRenderState *render_state, for (uvi = vertex->uv_begin(); uvi != vertex->uv_end(); ++uvi) { EggVertexUV *egg_uv = (*uvi); string name = egg_uv->get_name(); - if (name == "default") { - name = string(); - } + bool has_w = (find(uvw_names.begin(), uvw_names.end(), name) != uvw_names.end()); PT(InternalName) iname = InternalName::get_texcoord_name(name); EggMorphTexCoordList::const_iterator mti; for (mti = egg_uv->_duvs.begin(); mti != egg_uv->_duvs.end(); ++mti) { slider_names.insert((*mti).get_name()); record_morph(anim_array_format, character_maker, (*mti).get_name(), - iname, 2); + iname, has_w ? 3 : 2); } } } @@ -1910,23 +2030,20 @@ make_vertex_data(const EggRenderState *render_state, EggVertex::const_uv_iterator uvi; for (uvi = vertex->uv_begin(); uvi != vertex->uv_end(); ++uvi) { EggVertexUV *egg_uv = (*uvi); - TexCoordd orig_uv = egg_uv->get_uv(); - TexCoordd uv = egg_uv->get_uv(); + TexCoord3d orig_uvw = egg_uv->get_uvw(); + TexCoord3d uvw = egg_uv->get_uvw(); string name = egg_uv->get_name(); - if (name == "default") { - name = string(); - } PT(InternalName) iname = InternalName::get_texcoord_name(name); gvw.set_column(iname); BakeInUVs::const_iterator buv = render_state->_bake_in_uvs.find(iname); if (buv != render_state->_bake_in_uvs.end()) { // If we are to bake in a texture matrix, do so now. - uv = uv * (*buv).second->get_transform(); + uvw = uvw * (*buv).second->get_transform(); } - gvw.set_data2f(LCAST(float, uv)); + gvw.set_data3f(LCAST(float, uvw)); if (is_dynamic) { EggMorphTexCoordList::const_iterator mti; @@ -1935,13 +2052,13 @@ make_vertex_data(const EggRenderState *render_state, CPT(InternalName) delta_name = InternalName::get_morph(iname, morph.get_name()); gvw.set_column(delta_name); - TexCoordd duv = morph.get_offset(); + TexCoord3d duvw = morph.get_offset(); if (buv != render_state->_bake_in_uvs.end()) { - TexCoordd new_uv = orig_uv + duv; - duv = (new_uv * (*buv).second->get_transform()) - uv; + TexCoord3d new_uvw = orig_uvw + duvw; + duvw = (new_uvw * (*buv).second->get_transform()) - uvw; } - gvw.add_data2f(LCAST(float, duv)); + gvw.add_data3f(LCAST(float, duvw)); } } @@ -2994,91 +3111,6 @@ do_expand_object_type(EggGroup *egg_group, const pset &expanded, return true; } -//////////////////////////////////////////////////////////////////// -// Function: EggLoader::make_transform -// Access: Private -// Description: Walks back over the tree and applies the -// DeferredNodeProperties that were saved up along the -// way. -//////////////////////////////////////////////////////////////////// -CPT(TransformState) EggLoader:: -make_transform(const EggTransform3d *egg_transform) { - // We'll build up the transform componentwise, so we preserve any - // componentwise properties of the egg transform. - - CPT(TransformState) ts = TransformState::make_identity(); - int num_components = egg_transform->get_num_components(); - for (int i = 0; i < num_components; i++) { - switch (egg_transform->get_component_type(i)) { - case EggTransform3d::CT_translate: - { - LVector3f trans(LCAST(float, egg_transform->get_component_vector(i))); - ts = TransformState::make_pos(trans)->compose(ts); - } - break; - - case EggTransform3d::CT_rotx: - { - LRotationf rot(LVector3f(1.0f, 0.0f, 0.0f), - (float)egg_transform->get_component_number(i)); - ts = TransformState::make_quat(rot)->compose(ts); - } - break; - - case EggTransform3d::CT_roty: - { - LRotationf rot(LVector3f(0.0f, 1.0f, 0.0f), - (float)egg_transform->get_component_number(i)); - ts = TransformState::make_quat(rot)->compose(ts); - } - break; - - case EggTransform3d::CT_rotz: - { - LRotationf rot(LVector3f(0.0f, 0.0f, 1.0f), - (float)egg_transform->get_component_number(i)); - ts = TransformState::make_quat(rot)->compose(ts); - } - break; - - case EggTransform3d::CT_rotate: - { - LRotationf rot(LCAST(float, egg_transform->get_component_vector(i)), - (float)egg_transform->get_component_number(i)); - ts = TransformState::make_quat(rot)->compose(ts); - } - break; - - case EggTransform3d::CT_scale: - { - LVecBase3f scale(LCAST(float, egg_transform->get_component_vector(i))); - ts = TransformState::make_scale(scale)->compose(ts); - } - break; - - case EggTransform3d::CT_uniform_scale: - { - float scale = (float)egg_transform->get_component_number(i); - ts = TransformState::make_scale(scale)->compose(ts); - } - break; - - case EggTransform3d::CT_matrix: - { - LMatrix4f mat(LCAST(float, egg_transform->get_component_matrix(i))); - ts = TransformState::make_mat(mat)->compose(ts); - } - break; - - case EggTransform3d::CT_invalid: - nassertr(false, ts); - break; - } - } - - return ts; -} - //////////////////////////////////////////////////////////////////// // Function: EggLoader::get_combine_mode // Access: Private, Static diff --git a/panda/src/egg2pg/eggLoader.h b/panda/src/egg2pg/eggLoader.h index 4184889556..4dac3b2105 100644 --- a/panda/src/egg2pg/eggLoader.h +++ b/panda/src/egg2pg/eggLoader.h @@ -38,7 +38,7 @@ #include "textureStage.h" #include "texGenAttrib.h" #include "colorBlendAttrib.h" -#include "eggTransform3d.h" +#include "eggTransform.h" #include "geomVertexData.h" #include "geomPrimitive.h" @@ -80,6 +80,8 @@ public: const LMatrix4d *transform, bool is_dynamic, CharacterMaker *character_maker); + static CPT(TransformState) make_transform(const EggTransform *egg_transform); + private: class TextureDef { public: @@ -185,8 +187,6 @@ private: const pvector &expanded_history, const string &object_type); - CPT(TransformState) make_transform(const EggTransform3d *egg_transform); - static TextureStage::CombineMode get_combine_mode(const EggTexture *egg_tex, EggTexture::CombineChannel channel); diff --git a/panda/src/egg2pg/eggRenderState.cxx b/panda/src/egg2pg/eggRenderState.cxx index 0716534edf..189a1bd29d 100644 --- a/panda/src/egg2pg/eggRenderState.cxx +++ b/panda/src/egg2pg/eggRenderState.cxx @@ -536,24 +536,7 @@ CPT(RenderAttrib) EggRenderState:: apply_tex_mat(CPT(RenderAttrib) tex_mat_attrib, TextureStage *stage, const EggTexture *egg_tex) { if (egg_tex->has_transform()) { - const LMatrix3d &tex_mat = egg_tex->get_transform(); - LMatrix4f mat4(tex_mat(0, 0), tex_mat(0, 1), 0.0f, tex_mat(0, 2), - tex_mat(1, 0), tex_mat(1, 1), 0.0f, tex_mat(1, 2), - 0.0f, 0.0f, 1.0f, 0.0f, - tex_mat(2, 0), tex_mat(2, 1), 0.0f, tex_mat(2, 2)); - CPT(TransformState) transform; - - LVecBase3f scale, shear, hpr, translate; - if (decompose_matrix(mat4, scale, shear, hpr, translate)) { - // If the texture matrix can be represented componentwise, do - // so. - transform = TransformState::make_pos_hpr_scale_shear - (translate, hpr, scale, shear); - - } else { - // Otherwise, make a matrix transform. - transform = TransformState::make_mat(mat4); - } + CPT(TransformState) transform = EggLoader::make_transform(egg_tex); if (tex_mat_attrib == (const RenderAttrib *)NULL) { tex_mat_attrib = TexMatrixAttrib::make(); diff --git a/panda/src/egg2pg/eggRenderState.h b/panda/src/egg2pg/eggRenderState.h index 3aee562908..8ff6dc8cae 100644 --- a/panda/src/egg2pg/eggRenderState.h +++ b/panda/src/egg2pg/eggRenderState.h @@ -77,7 +77,7 @@ private: EggLoader &_loader; typedef pvector TexMatTextures; - typedef pmap TexMatTransforms; + typedef pmap TexMatTransforms; typedef pmap TexMats; }; diff --git a/panda/src/linmath/aa_luse.h b/panda/src/linmath/aa_luse.h index 8665ed5695..272f381538 100644 --- a/panda/src/linmath/aa_luse.h +++ b/panda/src/linmath/aa_luse.h @@ -53,12 +53,14 @@ typedef LPoint3f Vertexf; typedef LVector3f Normalf; typedef LPoint2f TexCoordf; +typedef LPoint3f TexCoord3f; typedef LVecBase4f Colorf; typedef LVecBase3f RGBColorf; typedef LPoint3d Vertexd; typedef LVector3d Normald; typedef LPoint2d TexCoordd; +typedef LPoint3d TexCoord3d; typedef LVecBase4d Colord; typedef LVecBase3d RGBColord; diff --git a/pandatool/src/bam/bamToEgg.cxx b/pandatool/src/bam/bamToEgg.cxx index 6f6a9424ec..a902a839f8 100644 --- a/pandatool/src/bam/bamToEgg.cxx +++ b/pandatool/src/bam/bamToEgg.cxx @@ -429,13 +429,13 @@ apply_node_properties(EggGroup *egg_group, PandaNode *node) { const LQuaternionf &quat = transform->get_quat(); const LVecBase3f &pos = transform->get_pos(); if (!scale.almost_equal(LVecBase3f(1.0f, 1.0f, 1.0f))) { - egg_group->add_scale(LCAST(double, scale)); + egg_group->add_scale3d(LCAST(double, scale)); } if (!quat.is_identity()) { - egg_group->add_rotate(LCAST(double, quat)); + egg_group->add_rotate3d(LCAST(double, quat)); } if (!pos.almost_equal(LVecBase3f::zero())) { - egg_group->add_translate(LCAST(double, pos)); + egg_group->add_translate3d(LCAST(double, pos)); } } else if (transform->has_mat()) { diff --git a/pandatool/src/fltegg/fltToEggLevelState.cxx b/pandatool/src/fltegg/fltToEggLevelState.cxx index 27a5f5b760..b21353bcbb 100644 --- a/pandatool/src/fltegg/fltToEggLevelState.cxx +++ b/pandatool/src/fltegg/fltToEggLevelState.cxx @@ -161,7 +161,7 @@ set_transform(const FltBead *flt_bead, EggGroup *egg_group) { const FltTransformTranslate *trans; DCAST_INTO_V(trans, step); if (!trans->get_delta().almost_equal(LVector3d::zero())) { - egg_group->add_translate(trans->get_delta()); + egg_group->add_translate3d(trans->get_delta()); } } else if (step->is_exact_type(FltTransformRotateAboutPoint::get_class_type())) { @@ -169,12 +169,12 @@ set_transform(const FltBead *flt_bead, EggGroup *egg_group) { DCAST_INTO_V(rap, step); if (!IS_NEARLY_ZERO(rap->get_angle())) { if (!rap->get_center().almost_equal(LVector3d::zero())) { - egg_group->add_translate(-rap->get_center()); + egg_group->add_translate3d(-rap->get_center()); } LVector3d axis = LCAST(double, rap->get_axis()); - egg_group->add_rotate(rap->get_angle(), axis); + egg_group->add_rotate3d(rap->get_angle(), axis); if (!rap->get_center().almost_equal(LVector3d::zero())) { - egg_group->add_translate(rap->get_center()); + egg_group->add_translate3d(rap->get_center()); } } @@ -183,12 +183,12 @@ set_transform(const FltBead *flt_bead, EggGroup *egg_group) { DCAST_INTO_V(rae, step); if (!IS_NEARLY_ZERO(rae->get_angle())) { if (!rae->get_point_a().almost_equal(LVector3d::zero())) { - egg_group->add_translate(-rae->get_point_a()); + egg_group->add_translate3d(-rae->get_point_a()); } LVector3d axis = rae->get_point_b() - rae->get_point_a(); - egg_group->add_rotate(rae->get_angle(), axis); + egg_group->add_rotate3d(rae->get_angle(), axis); if (!rae->get_point_a().almost_equal(LVector3d::zero())) { - egg_group->add_translate(rae->get_point_a()); + egg_group->add_translate3d(rae->get_point_a()); } } @@ -198,12 +198,12 @@ set_transform(const FltBead *flt_bead, EggGroup *egg_group) { if (!scale->get_scale().almost_equal(LVecBase3f(1.0f, 1.0f, 1.0f))) { if (scale->has_center() && !scale->get_center().almost_equal(LVector3d::zero())) { - egg_group->add_translate(-scale->get_center()); + egg_group->add_translate3d(-scale->get_center()); } - egg_group->add_scale(LCAST(double, scale->get_scale())); + egg_group->add_scale3d(LCAST(double, scale->get_scale())); if (scale->has_center() && !scale->get_center().almost_equal(LVector3d::zero())) { - egg_group->add_translate(scale->get_center()); + egg_group->add_translate3d(scale->get_center()); } } @@ -212,7 +212,7 @@ set_transform(const FltBead *flt_bead, EggGroup *egg_group) { DCAST_INTO_V(put, step); if (!put->get_from_origin().almost_equal(LVector3d::zero())) { - egg_group->add_translate(-put->get_from_origin()); + egg_group->add_translate3d(-put->get_from_origin()); } LQuaterniond q1, q2; look_at(q1, put->get_from_align() - put->get_from_origin(), @@ -225,10 +225,10 @@ set_transform(const FltBead *flt_bead, EggGroup *egg_group) { LQuaterniond q = invert(q1) * q2; if (!q.is_identity()) { - egg_group->add_rotate(q); + egg_group->add_rotate3d(q); } if (!put->get_to_origin().almost_equal(LVector3d::zero())) { - egg_group->add_translate(put->get_to_origin()); + egg_group->add_translate3d(put->get_to_origin()); } } else { diff --git a/pandatool/src/fltprogs/eggToFlt.cxx b/pandatool/src/fltprogs/eggToFlt.cxx index 5bdf5f3ba6..8ffcde9d4f 100644 --- a/pandatool/src/fltprogs/eggToFlt.cxx +++ b/pandatool/src/fltprogs/eggToFlt.cxx @@ -317,43 +317,33 @@ convert_group(EggGroup *egg_group, FltBead *flt_node, // flt bead. //////////////////////////////////////////////////////////////////// void EggToFlt:: -apply_transform(EggTransform3d *egg_transform, FltBead *flt_node) { +apply_transform(EggTransform *egg_transform, FltBead *flt_node) { flt_node->clear_transform(); bool components_ok = true; int num_components = egg_transform->get_num_components(); for (int i = num_components - 1; i >= 0 && components_ok; i--) { switch (egg_transform->get_component_type(i)) { - case EggTransform3d::CT_translate: + case EggTransform::CT_translate2d: { FltTransformTranslate *translate = new FltTransformTranslate(_flt_header); - translate->set(LPoint3d::zero(), egg_transform->get_component_vector(i)); + LVector2d v2 = egg_transform->get_component_vec2(i); + translate->set(LPoint3d::zero(), LVector3d(v2[0], v2[1], 0.0)); flt_node->add_transform_step(translate); } break; - case EggTransform3d::CT_rotx: + case EggTransform::CT_translate3d: { - FltTransformRotateAboutEdge *rotate = - new FltTransformRotateAboutEdge(_flt_header); - rotate->set(LPoint3d::zero(), LPoint3d(1.0, 0.0, 0.0), - egg_transform->get_component_number(i)); - flt_node->add_transform_step(rotate); + FltTransformTranslate *translate = + new FltTransformTranslate(_flt_header); + translate->set(LPoint3d::zero(), egg_transform->get_component_vec3(i)); + flt_node->add_transform_step(translate); } break; - case EggTransform3d::CT_roty: - { - FltTransformRotateAboutEdge *rotate = - new FltTransformRotateAboutEdge(_flt_header); - rotate->set(LPoint3d::zero(), LPoint3d(0.0, 1.0, 0.0), - egg_transform->get_component_number(i)); - flt_node->add_transform_step(rotate); - } - break; - - case EggTransform3d::CT_rotz: + case EggTransform::CT_rotate2d: { FltTransformRotateAboutEdge *rotate = new FltTransformRotateAboutEdge(_flt_header); @@ -363,25 +353,64 @@ apply_transform(EggTransform3d *egg_transform, FltBead *flt_node) { } break; - case EggTransform3d::CT_rotate: + case EggTransform::CT_rotx: { FltTransformRotateAboutEdge *rotate = new FltTransformRotateAboutEdge(_flt_header); - rotate->set(LPoint3d::zero(), egg_transform->get_component_vector(i), + rotate->set(LPoint3d::zero(), LPoint3d(1.0, 0.0, 0.0), egg_transform->get_component_number(i)); flt_node->add_transform_step(rotate); } break; - case EggTransform3d::CT_scale: + case EggTransform::CT_roty: + { + FltTransformRotateAboutEdge *rotate = + new FltTransformRotateAboutEdge(_flt_header); + rotate->set(LPoint3d::zero(), LPoint3d(0.0, 1.0, 0.0), + egg_transform->get_component_number(i)); + flt_node->add_transform_step(rotate); + } + break; + + case EggTransform::CT_rotz: + { + FltTransformRotateAboutEdge *rotate = + new FltTransformRotateAboutEdge(_flt_header); + rotate->set(LPoint3d::zero(), LPoint3d(0.0, 0.0, 1.0), + egg_transform->get_component_number(i)); + flt_node->add_transform_step(rotate); + } + break; + + case EggTransform::CT_rotate3d: + { + FltTransformRotateAboutEdge *rotate = + new FltTransformRotateAboutEdge(_flt_header); + rotate->set(LPoint3d::zero(), egg_transform->get_component_vec3(i), + egg_transform->get_component_number(i)); + flt_node->add_transform_step(rotate); + } + break; + + case EggTransform::CT_scale2d: { FltTransformScale *scale = new FltTransformScale(_flt_header); - scale->set(LPoint3d::zero(), LCAST(float, egg_transform->get_component_vector(i))); + LVector2d v2 = egg_transform->get_component_vec2(i); + scale->set(LPoint3d::zero(), LVector3f(v2[0], v2[1], 1.0f)); flt_node->add_transform_step(scale); } break; - case EggTransform3d::CT_uniform_scale: + case EggTransform::CT_scale3d: + { + FltTransformScale *scale = new FltTransformScale(_flt_header); + scale->set(LPoint3d::zero(), LCAST(float, egg_transform->get_component_vec3(i))); + flt_node->add_transform_step(scale); + } + break; + + case EggTransform::CT_uniform_scale: { FltTransformScale *scale = new FltTransformScale(_flt_header); float factor = (float)egg_transform->get_component_number(i); @@ -390,11 +419,25 @@ apply_transform(EggTransform3d *egg_transform, FltBead *flt_node) { } break; - case EggTransform3d::CT_matrix: + case EggTransform::CT_matrix3: { FltTransformGeneralMatrix *matrix = new FltTransformGeneralMatrix(_flt_header); - matrix->set_matrix(egg_transform->get_component_matrix(i)); + const LMatrix3d &m = egg_transform->get_component_mat3(i); + LMatrix4d mat4(m(0, 0), m(0, 1), 0.0, m(0, 2), + m(1, 0), m(1, 1), 0.0, m(1, 2), + 0.0, 0.0, 1.0, 0.0, + m(2, 0), m(2, 1), 0.0, m(2, 2)); + matrix->set_matrix(mat4); + flt_node->add_transform_step(matrix); + } + break; + + case EggTransform::CT_matrix4: + { + FltTransformGeneralMatrix *matrix = + new FltTransformGeneralMatrix(_flt_header); + matrix->set_matrix(egg_transform->get_component_mat4(i)); flt_node->add_transform_step(matrix); } break; diff --git a/pandatool/src/fltprogs/eggToFlt.h b/pandatool/src/fltprogs/eggToFlt.h index 8be7bf5129..771c57c2ae 100644 --- a/pandatool/src/fltprogs/eggToFlt.h +++ b/pandatool/src/fltprogs/eggToFlt.h @@ -32,7 +32,7 @@ class EggGroup; class EggVertex; class EggPrimitive; class EggTexture; -class EggTransform3d; +class EggTransform; class FltVertex; class FltBead; class FltTexture; @@ -56,7 +56,7 @@ private: FltGeometry::BillboardType billboard); void convert_group(EggGroup *egg_group, FltBead *flt_node, FltGeometry::BillboardType billboard); - void apply_transform(EggTransform3d *egg_transform, FltBead *flt_node); + void apply_transform(EggTransform *egg_transform, FltBead *flt_node); void apply_egg_syntax(const string &egg_syntax, FltRecord *flt_record); FltVertex *get_flt_vertex(EggVertex *egg_vertex, EggNode *context); FltTexture *get_flt_texture(EggTexture *egg_texture); diff --git a/pandatool/src/palettizer/textureReference.cxx b/pandatool/src/palettizer/textureReference.cxx index 0cc57e68a6..19ef601062 100644 --- a/pandatool/src/palettizer/textureReference.cxx +++ b/pandatool/src/palettizer/textureReference.cxx @@ -86,8 +86,8 @@ from_egg(EggFile *egg_file, EggData *data, EggTexture *egg_tex) { _egg_data = data; _tref_name = egg_tex->get_name(); - if (_egg_tex->has_transform()) { - _tex_mat = _egg_tex->get_transform(); + if (_egg_tex->has_transform() && egg_tex->is_transform_2d()) { + _tex_mat = _egg_tex->get_transform_2d(); if (!_inv_tex_mat.invert_from(_tex_mat)) { _inv_tex_mat = LMatrix3d::ident_mat(); } diff --git a/pandatool/src/xfileegg/xFileVertex.cxx b/pandatool/src/xfileegg/xFileVertex.cxx index c2a8c79f92..6d9d9a27b6 100644 --- a/pandatool/src/xfileegg/xFileVertex.cxx +++ b/pandatool/src/xfileegg/xFileVertex.cxx @@ -60,8 +60,8 @@ set_from_egg(EggVertex *egg_vertex, EggPrimitive *egg_prim) { if (egg_prim->has_texture()) { // Check if there's a texture matrix on the texture. EggTexture *egg_tex = egg_prim->get_texture(); - if (egg_tex->has_transform()) { - uv = uv * egg_tex->get_transform(); + if (egg_tex->has_transform() && egg_tex->is_transform_2d()) { + uv = uv * egg_tex->get_transform_2d(); } }