Changes for v0.3.9 (final).

to pop themselves down while the simulator is paused.

The problem was with the "real time" queue in the event manager,
causing the third argument of Nasal's settimer() (a flag for "sim
time") to be ignored.  Inverts the default sense of the argument, as
there are lots of uses of settimer() in the current code, almost none
of which want to use real time.

Note this fix introduces a header file incompatibility in SimGear --
be sure to update.

.cvsignore

@@ -2,7 +2,18 @@ Makefile
 Makefile.in
 SimGear.spec
 aclocal.m4
+autom4te.cache
 config.cache
 config.log
 config.status
 configure
+do-config.sh
+.cdtproject
+.project
+config.guess
+config.sub
+depcomp
+INSTALL
+install-sh
+missing
+mkinstalldirs

Doxyfile

@@ -22,7 +22,7 @@ PROJECT_NAME           = SimGear
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.0.19pre2
+PROJECT_NUMBER         = 0.3.9
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -64,14 +64,14 @@ EXTRACT_STATIC         = NO
 # various overviews, but no documentation section is generated. 
 # This option has no effect if EXTRACT_ALL is enabled. 
 
-HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_MEMBERS     = YES
 
 # If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
 # undocumented classes that are normally visible in the class hierarchy. 
 # If set to NO (the default) these class will be included in the various 
 # overviews. This option has no effect if EXTRACT_ALL is enabled. 
 
-HIDE_UNDOC_CLASSES     = NO
+HIDE_UNDOC_CLASSES     = YES
 
 # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
 # include brief member descriptions after the members that are listed in 
@@ -298,6 +298,7 @@ WARN_LOGFILE           =
 # with spaces. 
 
 INPUT                  = \
+        DoxygenMain.cxx \
 	simgear/bucket \
 	simgear/compiler.h \
 	simgear/constants.h \
@@ -307,13 +308,14 @@ INPUT                  = \
 	simgear/magvar \
 	simgear/math \
 	simgear/misc \
+        simgear/props \
 	simgear/route \
+	simgear/scene \
 	simgear/screen \
 	simgear/serial \
 	simgear/sg_inlines.h \
 	simgear/sg_traits.hxx \
-	simgear/sg_zlib.h \
-	simgear/sky \
+        simgear/sound \
 	simgear/threads \
 	simgear/timing \
 	simgear/xml
@@ -335,7 +337,7 @@ RECURSIVE              = YES
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag. 
 
-EXCLUDE                = simgear/metakit simgear/zlib
+EXCLUDE                = simgear/scene/sky/clouds3d
 
 # If the value of the INPUT tag contains directories, you can use the 
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
@@ -385,7 +387,7 @@ FILTER_SOURCE_FILES    = NO
 # of all compounds will be generated. Enable this if the project 
 # contains a lot of classes, structs, unions or interfaces. 
 
-ALPHABETICAL_INDEX     = NO
+ALPHABETICAL_INDEX     = YES
 
 # If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
 # the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
@@ -514,7 +516,7 @@ COMPACT_LATEX          = NO
 # by the printer. Possible values are: a4, a4wide, letter, legal and 
 # executive. If left blank a4wide will be used. 
 
-PAPER_TYPE             = a4wide
+PAPER_TYPE             = letter
 
 # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
 # packages that should be included in the LaTeX output. 

DoxygenMain.cxx

@@ -0,0 +1,108 @@
+/* This is a dummy code file that only contains doxygen main page
+   documentation.  It has a .cxx extension so that emacs will happily
+   autoindent correctly. */
+
+/** \mainpage SimGear
+ * Simulation, Visualization, and Game development libraries.
+
+ * \section intro Introduction
+ *
+ * SimGear is a collection of libraries which provide a variety of
+ * functionality useful for building simulations, visualizations, and
+ * even games.  All the SimGear code is designed to be portable across
+ * a wide variety of platforms and compilers.  It has primarily been
+ * developed in support of the FlightGear project, but as development
+ * moves forward, we are generalizing the code to make more of it
+ * useful for other types of applications.
+ *
+ * Some of the functionality provide includes
+ *
+ * - Compiler and platform abstractions for many tricky differences.
+ *   (compiler.h)
+ *
+ * - A whole earth tiling/indexing scheme.  (SGBucket)
+ *
+ * - A console debugging output scheme that tracks severity and
+ *   category that can be completely compiled out for a final build release.
+ *   (logstream.hxx)
+ *
+ * - Code to manage "real" time (SGTime), time zones (SGTimeZone), and
+ *   millesecond time differences (SGTimeStamp).
+ *
+ * - Code to calculate accurate positions of sun, moon, stars, and
+ *   planets for a given time, date, season, earth location, etc.
+ *   (SGEphemeris)
+ *
+ * - Code to render a realistic sky dome, cloud layers, sun, moon,
+ *   stars, and planets all with realistic day/night/sunset/sunrise
+ *   effects.  Includes things like correct moon phase, textured moon,
+ *   sun halo, etc. (SGSky is built on top of SGCloudLayer ...)
+ *
+ * - Simple serial (SGSerial), file (SGFile), socket (SGSocket), and
+ *   UDP socket (SGSocketUDP) I/O abstractions.
+ *
+ * - Code to calculate magnetic variation. (SGMagVar)
+ *
+ * - A variety of classes and functions for interpolation tables
+ *   (SGInterpTable), least squares computation (leastsqs.hxx), 3D
+ *   point/vectors (Point3D), 3D polar math and conversions (polar3d.hxx),
+ *   WGS-84 math and conversions (sg_geodesy.hxx), random number abstraction
+ *   (sg_random.h), STL conglomerates for common list types (sg_types.hxx),
+ *   and other vector and linear algebra routines (vector.hxx)
+ *
+ * - An abstraction to hide platform dependent path naming schemes. (SGPath)
+ *
+ * - A C++ streams wrapper to handle compress input/output streams.
+ *   (sg_gzifstream)
+ *
+ * - An optimized "property manager" which associates ascii property
+ *   names with their corresponding value.  This can be a great way to build
+ *   loose linkages between modules, or build linkages/connections that can
+ *   be determined from config files or at runtime.  (SGPropertyNode)
+ *   Also included is a set of functions to dump the property tree into a
+ *   standard xml file and subsequently read/parse a standard xml file and
+ *   rebuild the associated property tree.  (props_io.hxx)
+ *
+ * - Scene management and drawing routines:
+ *   - material property management
+ *   - object management
+ *   - terrain tile management and paging
+ *   - sky dome rendering (with ephemeral objects)
+ *
+ * - Code to handle screen dumps (screen-dump.hxx) and ultra-hires
+ *   tile rendered screen dumps (tr.h)
+ *
+ * - A sound effects manager.  (SGSoundMgr, SGSimpleSound, SGSound)
+ *
+ * - A threading abstraction.  (SGThread)
+ *
+ * - A simple but highly functional XML parser that interfaces nicely
+ *   with the property manager.  (easyxml.hxx)
+
+ * \section supports Supported Platforms
+ * SimGear has been built on the following platforms:
+ *
+ *   - Linux (x86)
+ *   - Windows (MSVC, Cygwin, Mingwin)
+ *   - SGI (native compilers)
+ *   - Mac OS X
+ *   - FreeBSD
+ 
+ * \section depends Dependencies
+ *
+ * SimGear depends on several other open source packages.  These must
+ * be installed before SimGear can be installed:
+ *
+ *   - glut and opengl
+ *   - plib (http://plib.sf.net)
+ *   - metakit
+ *   - zlib
+ *   - libjpeg (optional)
+ *   - pthread (optional)
+ 
+ * \section license Licensing
+ *
+ * SimGear is licensed under the terms of the LGPL
+
+ */
+

Makefile.am

@@ -1,9 +1,8 @@
 EXTRA_DIST = \
 	acinclude.m4 \
 	autogen.sh \
-	mksymlinks.sh \
+	DoxygenMain.cxx \
 	README.MSVC \
-	README.metakit \
 	README.zlib \
 	SimGear.dsp \
 	SimGear.dsw
@@ -11,7 +10,7 @@ EXTRA_DIST = \
 SUBDIRS	= src-libs simgear
 
 dist-hook:
-	(cd $(top_srcdir); $(HOME)/projects/FlightGear-0.7/admin/am2dsp.pl)
+	(cd $(top_srcdir); $(HOME)/Projects/FlightGear/admin/am2dsp.pl)
 
 #
 # Rule to build RPM distribution package

NEWS

@@ -1,3 +1,179 @@
+New in 0.3.9
+* November 17, 2005
+
+* Add support for OpenAL 1.1 (with a separate alut library.)
+* Add support for volumetric shadows.  Aircraft can cast shadows on themselves
+  as well as onto the ground (by Harald Johnsen.)
+* New 3d volumetric clouds by Harald Johnsen (along with several rounds of
+  followup fixes and improvements.)
+* Remove Mark Harris's old 3d clouds because they were never properly
+  integrated.  And we now have new 3d clouds.
+* Add support for seasonal textures (with a set of winter textures added
+  to FlightGear.)
+* Updated Nasal scripting system.  Adds several new syntax convenience
+  features, fixes parser bugs, fixes several internal bugs.
+* Our 3d cockpit jitter problem is fixed (woohoo!)
+* Add code to support rendering to a texture.
+* Allow "tip" popups to pop themselves down after the appropriate
+  timeout, even if the sim time is paused.
+* Various low model level animation fixes and additions ... color,
+  transparency, 'chrome' effects, randomized spin, etc.
+* Create our own portable stdint.h implementation.
+* Fixed several memory leaks.
+* removeChildren() added to the property system.
+* Fix many cases of 'const'.
+* Fixes for cygwin, solaris/sun, Mac OS X, MSVC, gcc-3.4.x.
+
+
+New in 0.3.8
+* January 18, 2005
+
+* Configure script does a sanity check for the existence of openal.
+* Better pthreads detection for FreeBSD.
+* Abstract out the location of gl.h, glu.h, and glut.h so we can more
+  easily support MacOS which puts these in an oddball location.
+* Added two new debug output types for instrumentation and systems.
+* Add a name parameter to the waypoint class for supporting a route
+  manager in the flightgear gps module.
+* Make display list usage optional.
+* Event manager: specifying a zero delay will force event execution in
+  the next frame rather than entering an infinite loop.
+* gcc-4.0 fix.
+* Fixes to property tree loading and saving.
+* Make volume inaudible at startup.
+* Solaris fixes.
+* For low density cloud coverage, blend the layer to nothing as we pass
+  through instead of fully engulfing the aircraft in the cloud.
+* Add several new capabilities to the texture management code for building
+  normal maps and doing some simple on-the-fly effects on textures.
+* Better error message for sound problems.
+* Add support for binding a thread to a specific CPU.
+
+
+New in 0.3.7
+* October 12, 2004
+
+* Add support for parsing xml from an in memory buffer, not just a file.
+* Don't reduce visibility for a "clear" cloud layer.
+* Add support for audio orientation (direction and cone) for internal
+  view and tower view.
+* Add support for drawing from display lists rather than in immediate mode.
+  This provides a big performance improvement on many systems.
+
+
+New in 0.3.6
+* July 29, 2004
+
+* Better MinGW support
+* A bit better handling of OpenAL under Cygwin
+* Switched audio system from plib's "sl/sm" to OpenAL.
+* Add support for scaling an object based on distance.  The scaling
+  factor is determined by a lookup table based on distance.
+* Add a "flash" animation type.
+* Fix cloud positioning/animation bugs.
+* Fix an off-by-one error in props_io.cxx
+* Clip audio gain (volume) to 1.0
+
+
+New in 0.3.5
+* March 26, 2004
+
+* Added Andy's nasal interpreter for small built in scripting tasks.
+  Nasal integrates nicely with FlightGear's property system.
+* Added new (much simpler) metar parsing code (removed older more
+  complex code.)
+* Support VASI/PAPI lights correctly.
+* Fixes to cloud animation.
+* Updates to sky dome coloring as well as sun/moon coloring.
+* Vary environment lighting with visibility (subtlety.)
+* Support control of alpha test in model animation.
+* Complete rewrite of the event manager.
+* Updates to low level socket code to make it more flexible.
+* Win32 serial port communication fixes.
+* sg_geodesy rewritten to be more accurate and robust and symmetric.
+
+
+New in 0.3.4
+* October 22, 2003
+
+* Removed Metakit, FlightGear no longer uses it.
+* Removed all glut dependencies from SimGear.
+* Moved FGEventMgr and FGSubsystemMgr over to SimGear.
+* Some more incremental work on 3D clouds.
+* Added some "fastmath" functions.
+* Some lighting tweaks and fixes (especially for taxiways.)
+* Added support for "blend" and "scale" and "texture" animations.
+* Added support for animating rotations around an arbitrary axis (so the
+  aircraft designer isn't forced to figure out animations as a combination
+  of rotations around X, Y, and X axes.
+* Updates to sky dome modeling and make cloud layers follow the curve
+  of the earth (sort of.)
+* Updates to sky dome, cloud, and sunrise/sunset color and lighting
+  effects to make them more realistic and lifelike.
+* Better support for detecting and using OpenGL extensions at run time.
+* Add support for win32-pthreads in MSVC.NET
+* Various MSVC fixes.
+* Various Solaris fixes.
+* Various cygwin/mingwin fixes.
+* Various Mac OS X fixes.
+* Various Irix fixes.
+
+
+New in 0.3.3
+* June 3, 2003
+
+* Fix a compile problem for cygwin
+* Updated/tweaked doxygen documentation in several areas
+
+
+New in 0.3.2
+* June 2, 2003
+
+* Moved quite a bit of low level model management and "state"
+  management code from FlightGear into SimGear and did a substantial
+  amount of restructuring and dependency clean up in the process.
+  Created a "scene" subdirectory with sub-subdirectories for material
+  management, basic model and model animation management, sky
+  rendering, and low level loaders for the "TerraGear" tile object format.
+* Removed support of the flat shaded and non-textured material
+  property variants.  You can still do these things, but extra states
+  are no longer set up automatically.
+* Removed 3d clouds from the default build ... these need a maintainer
+  or better yet, a complete plib-based rewrite.
+* Moved the FlightGear sound effect manager code over to SimGear.
+* Updated the cloud layer surface to better follow the inverted bowl
+  shape.
+* Much work on cloud/sky coloring, and also much work on
+  sunset/sunrise coloring.
+* Fixed an obscure bug in cloud texture loading which caused each
+  cloud texture to be loaded 5 times.  Ouch!
+* Various class and function renaming to make them better fit into the
+  standard SimGear naming scheme.
+* Added some additional convenience functions to the SGPath class.
+* Upgraded the distributed version of metakit.
+* FreeBSD fixes.
+* Irix fixes (better STL/ISO C++ header support.)
+* Mingwin fixes.
+* Better MacOS support
+* MSVC fixes.
+
+
+New in 0.3.1
+* December 4, 2002
+
+* Fix a major packaging blunder with several missing files.
+
+
+New in 0.3.0
+* December 3, 2002
+
+* removed interpreter subdir
+* NOMINAX fix for Cygwin/gcc-3.2
+* Added some prototype 3d clouds based on Mark Harris's demos.
+* Simplified the command manager interface
+* Allow an "include" attribute on root PropertyList element.
+
+
 New in 0.2.0
 * September 6, 2002
 
@@ -5,7 +181,7 @@ New in 0.2.0
 * Removed efence support (in favor of valgrind.)
 
 * Added a javascript interpreter.
-* SGSocket reimplimented on top of plib/net libs.
+* SGSocket reimplemented on top of plib/net libs.
 * Added a new random number generation algorithm.
 * Total rewrite of the strutils package.
 
@@ -15,7 +191,7 @@ New in 0.2.0
 * Mac OS X fixes.
 * Irix fixes.
 * Code clean ups to remove warning messages.
-* Optimizations in sg_binobj to reduce the amout of memory copying
+* Optimizations in sg_binobj to reduce the amount of memory copying
   needed when loading a binobj format file.
 * Fixed a couple places where variables could be used before they were
   initialized.
@@ -35,7 +211,7 @@ New in 0.0.18
 * Upgrade to metakit-2.4.2-32.tar.gz (latest upstream release)
 * Added support for point objects in the scenery file format.
 * Additions to the binary file format to make it *much* more flexible.
-  For each major primative type: points, triangles, fans, and strips, you
+  For each major primitive type: points, triangles, fans, and strips, you
   can specify an index list of vertices, normals, colors, and texture
   coordinates.  You can skip any of these you like to save on space.
 * Added support for new file features in the binary -> ascii scenery file
@@ -86,7 +262,7 @@ New in 0.0.17pre1
 
 New in 0.0.16
 * July 12, 2001
-* Various changes to the property manager implimentation to better support
+* Various changes to the property manager implementation to better support
   dumping out the desired portions of the property tree to file.
 * Don't compile the metakit demos by default (causes problems for Irix)'
 * Other various tweaks for Irix.
@@ -129,7 +305,7 @@ New in 0.0.15
   read/write routines.
 * Added doxygen comments for all public interface code.  Documentation
   can be accessed via the SimGear web page.
-* Many FG -> SG name space changes for better consistancy throughout
+* Many FG -> SG name space changes for better consistency throughout
   this package.
 * Added property aliases, repeated name tags, and a general xml
   inclusion facilities.  Many other property manager clean ups
@@ -220,4 +396,4 @@ New in 0.0.4
 
 
 New in 0.0.3
-* Release that conincides with FlightGear-0.7.2
+* Release that coincides with FlightGear-0.7.2

README.OpenAL

@@ -0,0 +1,12 @@
+[This file is mirrored in both the FlightGear and SimGear packages.]
+
+You *must* have the development components of OpenAL installed on your system
+to build FlightGear!"  You can get a copy here:
+
+    http://www.openal.org
+
+Build notes:
+
+The OpenAL developers do not make "versioned" releases so we recommend that
+you pull the latest version via anonymous CVS (follow the instructions at
+the OpenAL web site) and build/install that.

README.metakit

@@ -1,285 +0,0 @@
-For your convenience (and with the author's permission) a copy of the
-MetaKit source is bundled with SimGear in $(top_srcdir)/src-libs/.
-You must have metakit installed before you can build SimGear.
-
-- Most linux distributions have a metakit package.  For linux
-  developers, we recommend ysou install your distributions package
-  rather than building from source.
-
-- For developers on most other platforms, you will have to build
-  metakit from source and install it yourself.  For your convenience a
-  tar ball of the metakit source is included with the simgear source
-  distribution.  Untar the metakit source, and follow the included
-  build and installation instructions.
-
-Once metakit is installed you can return to configuring and building
-Simgear.
-
-=============================================================================
-
-Potentially important build note:
-
-  Later on when you are linking programs with -lmk4 (i.e. FlightGear or one
-  of it's associated programs) if you come across an error similar to the
-  following:
-
-     c++  -Wall -O2 -L/usr/local/lib -o gensimple  gensimple.o libAirports.a
-          -lsgdebug -lsgmisc -lmk4 -lz -lm 
-     /usr/local/lib/libmk4.a(view.o)(.text+0x1c8):view.cpp: multiple definition
-          of `c4_View::~c4_View(void)'
-    libAirports.a(simple.o)(.text$_$_7c4_View+0x0):simple.cxx: first defined
-          here
-    collect2: ld returned 1 exit status
-    make[2]: *** [gensimple] Error 1
-    make[2]: Leaving directory `/home/curt/FlightGear-0.7.7/src/Airports'
-    make[1]: *** [all-recursive] Error 1
-    make[1]: Leaving directory `/home/curt/FlightGear-0.7.7/src'
-    make: *** [all-recursive] Error 1
-
-  Then you need to come back and rebuild Metakit with the -DNDEBUG flag.
-  For unix/cygwin systems, modify the unix/Makefile file and add -DNDEBUG
-  to the CFLAGS line.
-
-Now we return you to the official metakit readme ... :-)
-
-
-The MetaKit Library 2.01                                            March 2000
-==============================================================================
-
-
-WHAT IT IS - MetaKit is an embeddable database which runs on Unix, Windows,
-    Macintosh, and other platforms.  It lets you build applications which
-    store their data efficiently, in a portable way, and which will not need a
-    complex runtime installation.  In terms of the data model, MetaKit takes
-    the middle ground between RDBMS, OODBMS, and flat-file databases - yet it
-    is quite different from each of them.
-
-WHAT IT ISN'T - MetaKit is not: 1) multi-user/-threading, 2) scalable to
-    gigabytes, 3) proprietary software, 4) full of bugs, 5) just a toy.
-
-TECHNOLOGY - Everything is stored variable-sized yet with efficient positional
-    row access.  Changing an existing datafile structure is as simple as re-
-    opening it with that new structure.  All changes are transacted.  You can
-    mix and match software written in C++, Python, and Tcl.  Things can't get
-    much more flexible...
-
-CORE - The Metakit core library is written in C++.  It has a code footprint of
-    just over 100 Kb on Windows.  It can be used as DLL, or linked statically.
-    Debug builds include extensive assertion checks to catch problems early.
-
-PYTHON - The binding for Python is called "Mk4py".  It uses SCXX by Gordon
-    McMillan as C++ glue interface.  The source is in directory "python/".
-
-TCL/TK - The MK extension for Tcl is called "Mk4tcl".  It is being used in a
-    number of commercial projects, for in-house use as well as in commercially
-    distributed products.  The source is in directory "tcl/".
-
-LICENSE AND SUPPORT - MetaKit 2.01 is distributed as open source software (the
-    X/MIT-style license is at the end of this document).  Commercial support
-    is available through an Enterprise License, see the URL mentioned below.
-
-DOCUMENTATION - All documentation uses HTML.  The main page is "MetaKit.html",
-    which leads to the rest of the documentation in the "doc/" directory.
-
-WEBSITE URLS - The main pages on the world wide web, for news and downloads:
-    Homepage:       http://www.equi4.com/metakit/
-    Python news:    http://www.equi4.com/metakit/python.html
-    Tcl/Tk news:    http://www.equi4.com/metakit/tcl.html
-    License info:   http://www.equi4.com/metakit/license.html
-    Contact info:   http://www.equi4.com/contact.html
-
-
-INSTALLATION
-============
-
-Starting with this release, all platform builds and language bindings are now
-designed to work from a single common "builds/" directory.  It turns out to
-be impossible to keep build side-effects limited to *just* this directory
-(CodeWarrior can't be told where to place its temp data, and Visual C++ still
-alters a few files next to the project ".dsw" file, to name two offenders).
-
-UNIX
-
-    It is no longer advised to build the Unix code in the "unix/" directory.
-    Instead, you should perform the following steps:
-        % cd builds
-        % ../unix/configure
-        % make
-        % make test
-    And optionally (this only installs the core lib, not script extensions):
-        % make install
-
-    By switching to the "builds/" directory, you will keep the distribution
-    directory tree 100% unaltered.  All changes are made in this subdir, and
-    all final build results are left behind in this same subdir.
-
-    Nastiness: if you build Mk4tcl, please do a "make Mk4tcl.so" as well.
-    And if you intend to create the Python extension, do a "make Mk4py.so".
-    The "libmk4tcl.so.0.0.0" and "libMk4py.so.0.0.0" targets are bogus ones.
-
-    You will probably have to make changes in the makefile to locate the
-    proper includes and libs for Python (Tcl has been fixed, see "--with-tcl).
-    You probably only need to adjust "CXX_SWITCHES_PY" to find the headers.
-
-    To build with STL containers and strings, you can do the following:
-        make CXXFLAGS='-Dq4_STD' test   # add -O3 etc, as needed
-    This passes the test suite on Linux RedHat 5.2 with gcc 2.95-2.
-
-    See below for some platform-specific build notes.
-
-WINDOWS
-
-    There is a "win/" directory which contains subdirectories for a number of
-    compiler systems.  MetaKit has been built with many different compilers
-    in the past (Microsoft, Borland, Watcom, Symantec, Metrowerks, Optima),
-    but to preserve my sanity (there are 12 configurations for MSVC6 alone!),
-    I am limiting myself to MSVC6, MWCW5, Borland C++ Builder 4, and Cygwin.
-
-    The MS Visual C++ 6.0 project is "win/msvc60/mksrc.dsw", with subprojects
-    for the C++ demo (mkdemo), building dll's (mkdll), static libs (mklib),
-    regression tests (mktest), as well as Tcl (mktcl) and Python (mkpython).
-    It has been set up to place all intermediate files and final results in
-    the "builds/" subdirectory, even though you'll launch it from "win/".
-
-    To build with STL containers and strings under MSVC, define "q4_STD".
-    To build with MFC containers and strings under MSVC, define "q4_MFC".
-
-    The Metrowerks Codewarrior project is in the "mac/" directory, and can be
-    used to build both Mac and Windows versions (on either Mac *or* Windows).
-    The core libraries are built with "mac/cw5.mcp", demos / tests are built
-    with "cw5apps.mcp", Tcl is "cw5tcl.mcp", and Python is "cw5python.mcp".
-
-    The Borland C++ Builder projects have not yet been incorporated in this
-    release, but the "KitViewer" application is an example of how to use BCB.
-
-    The Cygwin build (B20.1 / gcc 2.95.2) is different, because it uses the
-    unix autoconf system, and must be launched as described above for UNIX.
-    I have upgraded to the latest development of libtool to be able to build
-    DLL's with Cygwin.  You can build the "-mno-cygwin" version by editing
-    the Makefile by hand and adding that option to CXXFLAGS.
-
-    Rob Bloodgood adds that the following GCC options are for maximum code
-    efficiency on x86 hardware: "-O2 -m486 -malign-loops=2 -malign-jumps=2".
-    I have not yet tried this myself, but am passing on the tip.
-
-MACINTOSH
-
-    The Mac version requires Metrowerks CodeWarrior 5.  See the info above
-    in the Windows section (MWCW is multi-platform).  The projects are all
-    located in the "mac/" folder, which is also where MWCW will place its own
-    "... Data" folders with intermediate results.  As with all other setups,
-    final results are made to end up in the "builds/" directory.
-
-    Static 68K builds appear to work fine, the 68K CFM variants will need
-    some more work (I couldn't get the libraries to export their symbols).
-
-
-PLATFORM-SPECIFIC NOTES
-=======================
-
-* Linux RH 5.2 / gcc 2.95.2
-
-    Builds with gcc 2.95.2 work out of the box.  The Tcl extension ends up as
-    ".libs/libmk4tcl.so.0.0.0" (to please libtool), and should be renamed to
-    "Mk4tcl.so".  Similarly, ".libs/libMk4py.so.0.0.0" is in fact the Python
-    extension, and *must* be renamed to "Mk4py.so" to call it from Python.
-
-    The core MK libs end up as ".libs/libmk4.a" and ".libs/libmk4.so.0.0.0".
-
-* Solaris 2.6 / gcc 2.8.1
-
-    The Solaris builds are nasty for several reasons:
-
-    - I do not own such a machine, and often have to make arrangements
-      (or fight limited space on one of the machines I can telnet to).
-    - The gcc 2.8.1 optimizer appears to be buggy, I have had to turn off
-      the default "-O3" flag to prevent compiler crashes (several files).
-      This problems appears to be resolved with gcc 2.95.
-    - Locking on Solaris (especially w.r.t NFS) remains a mystery to me.
-      The Tcl and Python extensions both use locking (the core not yet).
-      See tcl/Mk4tcl.cpp around line 520, and python/PyStorage.cpp around
-      line 80 for details.  It's all pretty messy, and not 100% correct.
-
-    Despite this, I'm doing my best to resolve these issues.  Having a solid
-    build of the core *and* of Tcl / Python extensions is quite important.
-
-* Other Unix systems
-
-    No further notes, though many systems will build fine out of the box.
-
-* Windows
-
-    MSVC 6 builds MK as static lib and as DLL (universal config, I have not
-    yet created build versions with MFC or STL, mainly because MK can now be
-    used in all contexts regardless of how it was built).  The Python and Tcl
-    extensions build as dynamic extensions (a static build is easy to add).
-
-    MWCW 5 builds MK as static lib and as DLL (interestingly enough, the DLL
-    is slightly smaller than MSVC 6 - 102 vs 108 Kb - when their runtimes are
-    linked in dynamically as well).  I have not added Win builds for Tcl or
-    Python, since MSVC 6 has those already.
-
-    Cygwin B20.1, with gcc 2.95.2 ugrade, also builds MK as static lib and as
-    DLL.  Both "pure" Cygwin (i.e. requiring cygwin1.dll) and mingw32 (using
-    the -mno-cygwin flag) build, but there are some hairy include issues when
-    it comes to choosing the right locking model for Tcl and Python.  These
-    issues have not been resolved fully.
-
-* Macintosh
-
-    MWCW 5 builds PPC shared libs, PPC static libs, and 68K static libraries.
-
-    Building 68K CFM libraries leads to a "MetaKit 68K.shlb" which comes out
-    of the linker without errors, but the result does not seem to have any
-    export symbols defined (despite the fact that the library is over 200 K).
-    Because of that, I've been unable to build apps or Mk4tcl/Mk4py so far.
-
-    The other three configurations build, but for some reason MK's regression
-    test stops at L03 (everything up to that point looks ok, i.e. over 90%).
-
-    The Mk4tcl PPC extension appears to work (quick manual test), and so does
-    the Python extension, "Mk4py.PPC.slb".  I have not yet given these two
-    a serious workout, hoping to have a basic test harness in place soon.
-
-* VMS, BeOS, ...
-
-    No news yet, please report your findings with any other platform builds.
-
-
-WHAT'S MISSING HERE
-===================
-
-    - a section on basic concepts (or maybe it doesn't belong here?)
-    - a section on getting started (C++, Python, Tcl all differ - point to
-      the respective intro pages)
-    - maybe a small sample for each of C++ / Tcl / Python, to give an idea
-    - mention TclKit, scripted docs (WiKit/Tequila?), VFS?
-    - I forgot... please tell me :)
-
-
-LICENSE AND COPYRIGHT STATEMENT
-===============================
-
-Copyright (c) 1996-2000 Jean-Claude Wippler
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-
-==============================================================================
--- Jean-Claude Wippler <jcw@equi4.com>

TODO

@@ -0,0 +1 @@
+03/25/2001 - Resolve location of Sky dome implimentation documentation.

Thanks

@@ -90,7 +90,7 @@ David Megginson <david@megginson.com>
   SimGear property manager/registry
 
 
-Curt Olson <curt@flightgear.org>
+Curt Olson http://www.flightgear.org/~curt/
   Curt is responsible for overall project and source code management.
   He has his hands in many of the areas.
 
@@ -175,7 +175,7 @@ NOTE:
 ----
 
 THIS DOCUMENT WAS INITIALLY WRITTEN BY 
-Curt L. Olson  <curt@flightgear.org>
+Curt L. Olson  <http://www.flightgear.org/~curt>
 
 
 05 Jul 2000 Removed non-SimGear entries (CLO)

acinclude.m4

@@ -3,7 +3,7 @@ dnl originally from ncftp 2.3.0
 dnl added wi_EXTRA_PDIR and wi_ANSI_C
 dnl $Id$
 dnl
-AC_DEFUN(wi_EXTRA_IDIR, [
+AC_DEFUN([wi_EXTRA_IDIR], [
 incdir="$1"
 if test -r $incdir ; then
 	case "$CPPFLAGS" in
@@ -25,7 +25,7 @@ dnl
 dnl
 dnl
 dnl
-AC_DEFUN(wi_EXTRA_LDIR, [
+AC_DEFUN([wi_EXTRA_LDIR], [
 mylibdir="$1"
 if test -r $mylibdir ; then
 	case "$LDFLAGS" in
@@ -47,7 +47,7 @@ dnl
 dnl __FP__
 dnl
 dnl
-AC_DEFUN(wi_EXTRA_PDIR, [
+AC_DEFUN([wi_EXTRA_PDIR], [
 progdir="$1"
 if test -r $progdir ; then
 	case "$PATH" in
@@ -76,7 +76,7 @@ dnl
 dnl If you want to look for subdirectories in include/lib directories,
 dnl you pass the names in argument 3, otherwise pass a dash.
 dnl
-AC_DEFUN(wi_EXTRA_DIRS, [echo "checking for extra include and lib directories..." 1>&6
+AC_DEFUN([wi_EXTRA_DIRS], [echo "checking for extra include and lib directories..." 1>&6
 ifelse([$1], yes, [dnl
 b1=`cd .. ; pwd`
 b2=`cd ../.. ; pwd`
@@ -111,7 +111,7 @@ done
 dnl
 dnl
 dnl
-AC_DEFUN(wi_HPUX_CFLAGS,
+AC_DEFUN([wi_HPUX_CFLAGS],
 [AC_MSG_CHECKING(if HP-UX ansi C compiler flags are needed)
 AC_REQUIRE([AC_PROG_CC])
 os=`uname -s | tr '[A-Z]' '[a-z]'`
@@ -144,7 +144,7 @@ AC_MSG_RESULT($ac_cv_hpux_flags)
 dnl
 dnl
 dnl
-AC_DEFUN(wi_CFLAGS, [AC_REQUIRE([AC_PROG_CC])
+AC_DEFUN([wi_CFLAGS], [AC_REQUIRE([AC_PROG_CC])
 wi_HPUX_CFLAGS
 	if test "$CFLAGS" = "" ; then
 		CFLAGS="-O"
@@ -165,7 +165,7 @@ wi_HPUX_CFLAGS
 dnl
 dnl
 dnl
-AC_DEFUN(wi_PROTOTYPES, [
+AC_DEFUN([wi_PROTOTYPES], [
 AC_MSG_CHECKING(if the compiler supports function prototypes)
 AC_TRY_COMPILE(,[extern void exit(int status);],[wi_cv_prototypes=yes
 AC_DEFINE(PROTOTYPES)],wi_cv_prototypes=no)
@@ -174,7 +174,7 @@ AC_MSG_RESULT($wi_cv_prototypes)
 dnl
 dnl
 dnl
-AC_DEFUN(wi_ANSI_C, [
+AC_DEFUN([wi_ANSI_C], [
 AC_MSG_CHECKING(ANSI-style function definitions)
 AC_TRY_COMPILE(,[int blubb(int x) { return 0; }],[wi_cv_ansi_funcs=yes
 AC_DEFINE(ANSI_FUNCS)],wi_cv_ansi_funcs=no)
@@ -183,7 +183,7 @@ AC_MSG_RESULT($wi_cv_ansi_funcs)
 dnl
 dnl
 dnl
-AC_DEFUN(wi_HEADER_SYS_SELECT_H, [
+AC_DEFUN([wi_HEADER_SYS_SELECT_H], [
 # See if <sys/select.h> is includable after <sys/time.h>
 if test "$ac_cv_header_sys_time_h" = no ; then
 AC_CHECK_HEADERS(sys/time.h sys/select.h)
@@ -211,7 +211,7 @@ fi
 dnl
 dnl
 dnl
-AC_DEFUN(wi_LIB_RESOLV, [
+AC_DEFUN([wi_LIB_RESOLV], [
 # See if we could access two well-known sites without help of any special
 # libraries, like resolv.
 
@@ -244,7 +244,7 @@ dnl
 dnl
 dnl
 
-AC_DEFUN(wi_LIB_NSL, [
+AC_DEFUN([wi_LIB_NSL], [
 AC_MSG_CHECKING(if we can use -lnsl)
 ac_save_LIBS="$LIBS";
 LIBS="$LIBS -lnsl";
@@ -261,7 +261,7 @@ dnl
 dnl
 dnl
 
-AC_DEFUN(nc_PATH_PROG_ZCAT, [
+AC_DEFUN([nc_PATH_PROG_ZCAT], [
 AC_PATH_PROG(GZCAT,gzcat)
 AC_PATH_PROG(ZCAT,zcat)
 if test "x$GZCAT" = x ; then
@@ -287,7 +287,7 @@ fi
 dnl
 dnl
 dnl
-AC_DEFUN(wi_SYSV_EXTRA_DIRS, [
+AC_DEFUN([wi_SYSV_EXTRA_DIRS], [
 # Use System V because their curses extensions are required.  This must
 # be done early so we use the -I and -L in the library checks also.
 # This is mostly a Solaris/SunOS hack.  Note that doing this will also
@@ -305,7 +305,7 @@ fi
 dnl
 dnl
 dnl
-AC_DEFUN(wi_DEFINE_UNAME, [
+AC_DEFUN([wi_DEFINE_UNAME], [
 # Get first 127 chars of all uname information.  Some folks have
 # way too much stuff there, so grab only the first 127.
 unam=`uname -a 2>/dev/null | cut -c1-127`
@@ -316,7 +316,7 @@ fi
 dnl
 dnl
 dnl
-AC_DEFUN(wi_READLINE_WITH_NCURSES, [
+AC_DEFUN([wi_READLINE_WITH_NCURSES], [
 # Readline and Ncurses could both define "backspace".
 # Warn about this if we have both things in our definitions list.
 
@@ -352,7 +352,7 @@ dnl
 
 dnl AC_EXT_DAYLIGHT
 dnl Check for an external variable daylight. Stolen from w3c-libwww.
-AC_DEFUN(AC_EXT_DAYLIGHT,
+AC_DEFUN([AC_EXT_DAYLIGHT],
 [ AC_MSG_CHECKING(int daylight variable)
 AC_TRY_COMPILE([#include <time.h>], [return daylight;],
   have_daylight=yes,
@@ -362,7 +362,7 @@ AC_MSG_RESULT($have_daylight)
 
 dnl AC_EXT_TIMEZONE
 dnl Check for an external variable timezone. Stolen from tcl-8.0.
-AC_DEFUN(AC_EXT_TIMEZONE,
+AC_DEFUN([AC_EXT_TIMEZONE],
 [
 #
 # Its important to include time.h in this check, as some systems (like convex)
@@ -395,7 +395,7 @@ fi
 
 ## AC_BZ_SET_COMPILER: Addition by Theodore Papadopoulo
 ## Patch by Jim McKelvey: change sed -e 's/ /@/g' to sed -e 's/ /@/'
-AC_DEFUN(AC_SG_SET_COMPILER,
+AC_DEFUN([AC_SG_SET_COMPILER],
   [cxxwith=`echo $1 | sed -e 's/ /@/'`
    case "$cxxwith" in
      *:*@*)                 # Full initialization syntax

configure.ac

@@ -1,16 +1,14 @@
-dnl Process this file with aclocal ; automake -a ; autoconf to produce a 
-dnl working configure script.
-dnl
-dnl $Id$
+dnl Process this file with autoget.sh to produce a working configure
+dnl script.
 
 AC_INIT
 AC_CONFIG_SRCDIR([simgear/bucket/newbucket.cxx])
 
-# Require at least automake 2.52
+dnl Require at least automake 2.52
 AC_PREREQ(2.52)
 
 dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(SimGear, 0.2.0)
+AM_INIT_AUTOMAKE(SimGear, 0.3.9)
 
 dnl Specify KAI C++ compiler and flags.
 dnl Borrowed with slight modification from blitz distribution.
@@ -38,20 +36,45 @@ AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
+dnl set the $host variable based on local machine/os
+AC_CANONICAL_HOST
 
-# Used on the Irix platform
-AR="ar"
-ARFLAGS="cru"
-OS=`uname -s`
-if test "$OS" = "IRIX" -o "$OS" = "IRIX64"; then
-    if test "$CXX" = "CC"; then
-        AR="CC -ar"
+dnl Used on the Irix platform
+case "${host}" in
+*-*-irix*)
+    if test "x$CXX" = "xCC" -o "x$CXX" = "xccache CC"; then
+        AR="$CXX -ar"
         ARFLAGS="-o"
+        CXXFLAGS="$CXXFLAGS -I$(top_srcdir)/simgear/compatibility/MIPSpro740"
+        compatibility_DIR="compatibility"
+        MIPSpro_DIRS="MIPSpro740"
+        AC_MSG_CHECKING([for MIPSpro compiler version 7.4 or newer])
+        AC_TRY_RUN([
+           int main() {
+              if ( _COMPILER_VERSION < 740 ) {
+                 return -1;
+              }
+              return 0;
+           }
+
+        ], AC_MSG_RESULT(yes),
+        [  AC_MSG_RESULT(no)
+           CXXFLAGS="$CXXFLAGS -I$(top_srcdir)/simgear/compatibility/MIPSpro721"
+           MIPSpro_DIRS="$(MIPSpro_DIRS) MIPSpro721"
+           AC_MSG_WARN([Using our own subset of the STL headers])
+        ], AC_MSG_RESULT(yes))
+        AC_SUBST(MIPSpro_DIRS)
     fi
-fi
+    ;;
+*)
+    AR="ar"
+    ARFLAGS="cru"
+    compatibility_DIR=
+    ;;
+esac
 AC_SUBST(AR)
 AC_SUBST(ARFLAGS)
-
+AC_SUBST(compatibility_DIR)
 
 if echo $includedir | egrep "simgear$" > /dev/null; then
     echo "includedir is" $includedir "libdir is" $libdir
@@ -60,8 +83,7 @@ else
     echo "includedir changed to" $includedir "libdir is" $libdir
 fi
          
-# set logging default value
-# with_logging=yes
+dnl set logging; default value of with_logging=yes
 AC_ARG_WITH(logging, [  --with-logging          Include logging output (default)])
 if test "x$with_logging" = "xno" ; then
     AC_DEFINE([FG_NDEBUG], 1, [Define for no logging output])
@@ -89,39 +111,34 @@ else
 fi
 AM_CONDITIONAL(ENABLE_JPEG_SERVER, test "x$with_jpeg_factory" = "xyes")
 
+# specify the plib location
+AC_ARG_WITH(plib, [  --with-plib=PREFIX      Specify the prefix path to plib])
 
-dnl Check for MS Windows environment
-AC_CHECK_HEADER(windows.h)
-
-AC_EGREP_CPP(yes,
-[#ifdef __MINGW32__
- yes
- #endif
-],is_mingw=yes, is_mingw=no)
-
-echo "IS_MINGW = $is_mingw"
-AM_CONDITIONAL(IS_MINGW, test "x$is_mingw" = "xyes")
-
-AC_EGREP_CPP(yes,
-[#ifdef __CYGWIN__
- yes
- #endif
-],is_cygwin=yes, is_cygwin=no)
-
-echo "IS_CYGWIN = $is_cygwin"
-AM_CONDITIONAL(IS_CYGWIN, test "x$is_cygwin" = "xyes")
-
-if test "x$HOSTTYPE" != "xmacintosh" -a "x$is_mingw" != "xyes"; then
-    dnl extra library and include directories
-    EXTRA_DIRS="/usr/local /usr/X11R6"
-
-    if test -d /opt/X11R6 ; then
-        EXTRA_DIRS="$EXTRA_DIRS /opt/X11R6"
-    fi
+if test "x$with_plib" != "x" ; then
+    echo "plib prefix is $with_plib"
+    EXTRA_DIRS="${EXTRA_DIRS} $with_plib"
 fi
 
+dnl Determine an extra directories to add to include/lib search paths
+case "${host}" in
+*-apple-darwin* | *-*-cygwin* | *-*-mingw32*)
+    echo no EXTRA_DIRS for $host
+    ;;
+
+*)
+    if test -d /usr/X11R6 ; then
+        EXTRA_DIR1="/usr/X11R6"
+    fi
+    if test -d /opt/X11R6 ; then
+        EXTRA_DIR2="/opt/X11R6"
+    fi
+    EXTRA_DIRS="${EXTRA_DIRS} $EXTRA_DIR1 $EXTRA_DIR2"
+    ;;
+
+esac
 wi_EXTRA_DIRS(no, ${EXTRA_DIRS})
 
+
 dnl Using AM_CONDITIONAL is a step out of the protected little 
 dnl automake fold so it is potentially dangerous.  But, we are
 dnl beginning to run into cases where the standard checks are not
@@ -129,65 +146,98 @@ dnl enough.  AM_CONDITIONALS are then referenced to conditionally
 dnl build a Makefile.in from a Makefile.am which lets us define custom
 dnl includes, compile alternative source files, etc.
 
-dnl X11 might be installed on Mac OS X, don't want to use it if it is.
-if test "x$HOSTTYPE" != "xmacintosh" ; then
-    dnl Check for X11 (fancy)
+dnl X11 might be installed on Mac OS X or cygwin/mingwin, we don't want
+dnl to use it if it is.
+case "${host}" in
+*-apple-darwin* | *-*-cygwin* | *-*-mingw32*)
+    echo no fancy X11 check
+    ;;
+
+*)
     AC_PATH_XTRA
-fi
+    ;;
+
+esac
 
 dnl Checks for libraries.
 
-null_LIBS="$LIBS"
+dnl Thread related checks
+AC_CHECK_HEADER(pthread.h)
+AC_SEARCH_LIBS(pthread_exit, [pthread c_r])
+if test "x$ac_cv_header_pthread_h" = "xyes"; then
+    CXXFLAGS="$CXXFLAGS -D_REENTRANT"
+    CFLAGS="$CFLAGS -D_REENTRANT"
 
-AC_CHECK_LIB(m, cos)
+  if test "x$ac_cv_search_pthread_exit" = "x-lc_r"; then
+    CXXFLAGS="-pthread $CXXFLAGS"
+    CFLAGS="-pthread $CFLAGS"
+  fi
+fi
+
+AM_CONDITIONAL(HAVE_THREADS, test "x$ac_cv_header_pthread_h" = "xyes")
+
+thread_LIBS="$LIBS"
+LIBS=""
+
+dnl search for network related libraries
+AC_SEARCH_LIBS(inet_addr, xnet)
+AC_SEARCH_LIBS(socket, socket)
+
+network_LIBS="$LIBS"
+LIBS=""
+
+dnl check for some default libraries
+AC_SEARCH_LIBS(cos, m)
 
 base_LIBS="$LIBS"
 
-dnl Thread related checks
-AC_CHECK_LIB(pthread, pthread_exit)
-AC_CHECK_HEADER(pthread.h)
-if test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -a "x$ac_cv_header_pthread_h" = "xyes"; then
-    CXXFLAGS="$CXXFLAGS -D_REENTRANT"
-    CFLAGS="$CFLAGS -D_REENTRANT"
-fi
-AM_CONDITIONAL(HAVE_THREADS, test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -a "x$ac_cv_header_pthread_h" = "xyes")
-
-AC_CHECK_LIB(socket, socket)
-
-dnl X11 might be installed, but we don't want to use it for OSX -dw-
-if test "x$HOSTTYPE" != "xmacintosh" ; then
-    AC_CHECK_LIB(X11, XCreateWindow)
-    AC_CHECK_LIB(Xext, XShmCreateImage)
-    AC_CHECK_LIB(Xi, XGetExtensionVersion)
-    AC_CHECK_LIB(ICE, IceOpenConnection)
-    AC_CHECK_LIB(SM, SmcOpenConnection)
-    AC_CHECK_LIB(Xt, XtMalloc)
-    AC_CHECK_LIB(Xmu, XmuLookupStandardColormap)
-fi
-
 dnl check for OpenGL related libraries
+case "${host}" in
+*-*-cygwin* | *-*-mingw32*)
+    dnl CygWin under Windoze.
 
-if test "x$HOSTTYPE" = "xmacintosh" ; then
-    dnl Macintosh OSX
-    LIBS="$LIBS -framework OpenGL -framework GLUT"
-elif test "x$ac_cv_header_windows_h" != "xyes" ; then
-    dnl Reasonable stuff for X-Windows based machines
+    echo Win32 specific hacks...
+    AC_DEFINE([WIN32], 1, [Define for Win32 platforms])
+    AC_DEFINE([NOMINMAX], 1, [Define for Win32 platforms])
 
-    AC_CHECK_LIB(GLcore, glNewList)
-    if test "x$ac_cv_lib_GLcore_glNewList" = "xno" ; then
-	dnl if no GLcore, check for GL
-	AC_CHECK_LIB(GL, glNewList)
-	if test "x$ac_cv_lib_GL_glNewList" = "xno" ; then
-	    dnl if no GL, check for MesaGL
-	    AC_CHECK_LIB(MesaGL, glNewList)
-	fi
-    else
+    LIBS="$LIBS -lglu32 -lopengl32"
+    LIBS="$LIBS -luser32 -lgdi32 -lwinmm"
+
+    dnl add -lwsock32 for mingwin
+    case "${host}" in
+    *-*-mingw32*)
+        base_LIBS="$base_LIBS -lws2_32"
+        ;;
+    esac
+
+    echo "Will link apps with $LIBS"
+    ;;
+
+*-apple-darwin*)
+    dnl Mac OS X
+
+    LIBS="$LIBS -framework OpenGL -framework Carbon -lobjc"
+    ;;
+
+*)
+    dnl X-Windows based machines
+
+    AC_SEARCH_LIBS(XCreateWindow, X11)
+    AC_SEARCH_LIBS(XShmCreateImage, Xext)
+    AC_SEARCH_LIBS(XGetExtensionVersion, Xi)
+    AC_SEARCH_LIBS(IceOpenConnection, ICE)
+    AC_SEARCH_LIBS(SmcOpenConnection, SM)
+    AC_SEARCH_LIBS(XtMalloc, Xt)
+    AC_SEARCH_LIBS(XmuLookupStandardColormap, Xmu)
+    
+    AC_SEARCH_LIBS(glNewList, [ GL GLcore MesaGL ])
+    if test "x$ac_cv_search_glNewList" = "x-lGLcore"; then
 	dnl if GLcore found, then also check for GL
-	AC_CHECK_LIB(GL, glXCreateContext)
+        AC_SEARCH_LIBS(glXCreateContext, GL)
     fi
 
     dnl if using mesa, check for xmesa.h
-    if test "x$ac_cv_lib_MesaGL_glNewList" = "xyes" ; then
+    if test "x$ac_cv_search_glNewList" = "x-lMesaGL"; then
 	AC_CHECK_HEADER(GL/fxmesa.h)
 	if test "x$ac_cv_header_GL_fxmesa_h" = "xyes"; then
 	    AC_DEFINE([XMESA], 1, [Define for fxmesa])
@@ -195,75 +245,73 @@ elif test "x$ac_cv_header_windows_h" != "xyes" ; then
         fi
     fi
 
-    AC_CHECK_LIB(GLU, gluLookAt)
-    if test "x$ac_cv_lib_GLU_gluLookAt" = "xno" ; then
-	dnl if no GLU, check for MesaGLU
-	AC_CHECK_LIB(MesaGLU, gluLookAt)
-    fi
+    AC_SEARCH_LIBS(gluLookAt, [ GLU MesaGLU ])
+    ;;
 
-    dnl check for glut
-    AC_CHECK_LIB(glut, glutGetModifiers)
-
-    dnl test for glutGameModeString, but avoid adding glut a second time into
-    dnl the list of libraries
-    save_LIBS="$LIBS"
-    AC_CHECK_LIB(glut, glutGameModeString)
-    LIBS="$save_LIBS"
-else
-    dnl Win32 libs
-
-    echo Win32 specific hacks...
-    AC_DEFINE([WIN32], 1, [Define for Win32 platforms])
-
-    dnl just define these to true and hope for the best
-    ac_cv_lib_glut_glutGetModifiers="yes"
-    ac_cv_lib_glut_glutGameModeString="yes"
-
-    if test "x$with_sgi_opengl" = "xyes" ; then
-        echo "Building with glut.dll, glu.dll, and opengl.dll"
-	WIN32_GLUT=glut
-	WIN32_GLU=glu
-	WIN32_OPENGL=opengl
-    else 
-	echo "Building with glut32.dll, glu32.dll, and opengl32.dll"
-	WIN32_GLUT=glut32
-	WIN32_GLU=glu32
-	WIN32_OPENGL=opengl32
-    fi
-
-    LIBS="$LIBS -l${WIN32_GLUT} -l${WIN32_GLU} -l${WIN32_OPENGL}"
-    LIBS="$LIBS -luser32 -lgdi32"
-    if test "x$is_mingw" = "xyes" ; then
-        EXTRA_DIRS="${EXTRA_DIRS}"
-    fi
-    echo "Will link apps with $LIBS"
-fi
-
-if test "x$ac_cv_lib_glut_glutGetModifiers" = "xno"; then
-    echo 
-    echo "Unable to find the necessary OpenGL or GLUT libraries."
-    echo "See config.log for automated test details and results ..."
-    exit 1
-fi
-
-if test "x$ac_cv_lib_glut_glutGameModeString" = "xno"; then
-    echo
-    echo "Your version of glut doesn't support game mode."
-    echo "You need to install the latest version of glut.  If your"
-    echo "distribution doesn't provide a newer version, you can get the source"
-    echo "code from:"
-    echo
-    echo "    http://reality.sgi.com/opengl/glut3/glut3.html"
-    exit 1
-fi
+esac
 
 opengl_LIBS="$LIBS"
 LIBS="$base_LIBS"
 
-AC_SUBST(base_LIBS)
-AC_SUBST(opengl_LIBS)
+dnl check for OpenAL libraries
+OPENAL_OK="no"
+case "${host}" in
+*-*-cygwin* | *-*-mingw32*)
+    dnl CygWin under Windoze.
+    INCLUDES="$INCLUDES -I/usr/local/include"
+    LIBS="$LIBS -L/usr/local/lib"
+    AC_SEARCH_LIBS(alGenBuffers, openal32)
+    AC_SEARCH_LIBS(alutInit, [ openal32 ALut ] )
+    LIBS="$LIBS -lwinmm -ldsound -ldxguid -lole32"
+    openal_LIBS="$LIBS"
+    OPENAL_OK="$ac_cv_search_alGenBuffers"
+    ;;
 
-AM_CONDITIONAL(HAVE_XWINDOWS, test "x$ac_cv_lib_X11_XCreateWindow" = "xyes" )
+*-apple-darwin*)
+    dnl Mac OS X
+
+    LIBS="$LIBS -framework IOKit -framework OpenAL"
+    openal_LIBS="$LIBS"
+    # not sure how to test if OpenAL exists on MacOS (does it come by default?)
+    OPENAL_OK="yes"
+    ;;
+
+*)
+    dnl default unix style machines
+
+    save_LIBS=$LIBS
+    LIBS="$LIBS $thread_LIBS"
+    AC_SEARCH_LIBS(alGenBuffers, openal)
+    AC_SEARCH_LIBS(alutInit, [ alut openal ] )
+    OPENAL_OK="$ac_cv_search_alGenBuffers"
+    openal_LIBS="$LIBS"
+    LIBS=$save_LIBS
+    ;;
+
+esac
+
+if test "$OPENAL_OK" == "no"; then
+    echo
+    echo "You *must* have the openal library installed on your system to build"
+    echo "SimGear!"
+    echo
+    echo "Please see README.OpenAL for more details."
+    echo
+    echo "configure aborted."
+    exit
+fi
+
+LIBS="$base_LIBS"
+
+AC_SUBST(base_LIBS)
+AC_SUBST(openal_LIBS)
+AC_SUBST(opengl_LIBS)
+AC_SUBST(thread_LIBS)
+AC_SUBST(network_LIBS)
+
+dnl Check for MS Windows environment
+AC_CHECK_HEADER(windows.h)
+AM_CONDITIONAL(EXTGL_NEEDED, test "x$ac_cv_header_windows_h" = "xyes")
 
 # The following are C++ items that need to be tested for with the c++
 # compiler
@@ -283,11 +331,11 @@ if test "x$ac_cv_header_plib_ul_h" != "xyes"; then
     exit
 fi
 
-AC_MSG_CHECKING([for plib 1.6.0 or newer])
+AC_MSG_CHECKING([for plib 1.8.4 or newer])
 AC_TRY_RUN([
 #include <plib/ul.h>
 
-#define MIN_PLIB_VERSION 160
+#define MIN_PLIB_VERSION 184
 
 int main() {
     int major, minor, micro;
@@ -302,37 +350,35 @@ int main() {
 ],
   AC_MSG_RESULT(yes),
   [AC_MSG_RESULT(wrong version);
-   AC_MSG_ERROR([Install plib 1.6.0 or later first...])],
+   AC_MSG_ERROR([Install plib 1.8.4 or later first...])],
   AC_MSG_RESULT(yes)
 )
 
-dnl Check for system installed metakit
-AC_CHECK_HEADER(mk4.h)
-if test "x$ac_cv_header_mk4_h" != "xyes"; then
-    echo 
-    echo "Metakit not found, you will need to install this first."
-    echo "Please read the README.metakit for more information."
-    exit
-fi
+LIBS="$saved_LIBS"
 
 AC_LANG_POP
 
-dnl Specify if we want logging (testing build) or not (release build)
-
 dnl Check for system installed zlib
 AC_CHECK_HEADER(zlib.h)
 if test "x$ac_cv_header_zlib_h" != "xyes"; then
-    echo 
-    echo "zlib not found, you will need to install this first."
-    echo "Please read the README.zlib for more information."
-    exit
+    echo
+    echo "zlib library not found."
+    echo
+    echo "If your OS does not provide an installable package for zlib"
+    echo "you will have to compile and install it first yourself.  A copy"
+    echo "of zlib-1.1.4.tar.gz is included with SimGear.  You will"
+    echo "have to untar this source code, and follow its included instructions"
+    echo "to compile and install on your system."
+    echo
+    echo "configure aborted."
+    echo
 fi
 
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS( \
 	fcntl.h getopt.h malloc.h memory.h stdint.h stdlib.h sys/param.h \
-	sys/stat.h sys/time.h sys/timeb.h unistd.h windows.h winbase.h values.h )
+	sys/stat.h sys/time.h sys/timeb.h unistd.h values.h )
 
 if test "x$ac_cv_header_stdint_h" = "xyes"; then
     AC_DEFINE([HAVE_STDINT_H], 1, [Define if stdint.h exists])
@@ -345,10 +391,14 @@ AC_HEADER_TIME
 AC_STRUCT_TM
 
 dnl Checks for library functions.
+old_LIBS=$LIBS
+LIBS="$base_LIBS $network_LIBS $opengl_LIBS"
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS( ftime gettimeofday timegm memcpy bcopy mktime strstr rand \
-	random drand48 setitimer getitimer signal GetLocalTime rint getrusage )
+AC_CHECK_FUNCS( [ \
+        ftime gettimeofday timegm memcpy bcopy mktime strstr rand \
+	random drand48 setitimer getitimer signal GetLocalTime rint getrusage ] )
+LIBS=$old_LIBS
 
 AM_CONFIG_HEADER(simgear/simgear_config.h)
 
@@ -358,22 +408,31 @@ AC_CONFIG_FILES([ \
 	src-libs/Makefile \
 	simgear/Makefile \
 	simgear/version.h \
+	simgear/compatibility/Makefile \
+	simgear/compatibility/MIPSpro721/Makefile \
+	simgear/compatibility/MIPSpro740/Makefile \
 	simgear/bucket/Makefile \
 	simgear/debug/Makefile \
 	simgear/ephemeris/Makefile \
-	simgear/interpreter/Makefile \
 	simgear/io/Makefile \
 	simgear/magvar/Makefile \
 	simgear/math/Makefile \
-	simgear/metar/Makefile \
+	simgear/environment/Makefile \
 	simgear/misc/Makefile \
+	simgear/nasal/Makefile \
+	simgear/props/Makefile \
 	simgear/route/Makefile \
+	simgear/scene/Makefile \
+	simgear/scene/material/Makefile \
+	simgear/scene/model/Makefile \
+	simgear/scene/sky/Makefile \
+	simgear/scene/tgdb/Makefile \
 	simgear/screen/Makefile \
 	simgear/serial/Makefile \
-	simgear/sky/Makefile \
+	simgear/sound/Makefile \
+	simgear/structure/Makefile \
 	simgear/threads/Makefile \
 	simgear/timing/Makefile \
-	simgear/xgl/Makefile \
 	simgear/xml/Makefile \
 ])
 AC_OUTPUT
@@ -391,7 +450,7 @@ else
     echo "Debug messages: yes"
 fi
 
-echo -n "Automake version: ($AUTO_MAKE_VERSION) "
+echo -n "Automake version: "
 automake --version | head -1
 
 if test "x$with_jpeg_factory" = "xyes"; then
@@ -400,8 +459,9 @@ else
    echo "Without JPEG Factory support"
 fi
 
-if test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -a "x$ac_cv_header_pthread_h" = "xyes"; then
+if test "x$ac_cv_header_pthread_h" = "xyes"; then
    echo "Threads: pthread lib found."
 else
    echo "Threads: no threads (pthread lib not found.)"
 fi
+

mksymlinks.sh

@@ -1,42 +0,0 @@
-#! /bin/sh
-
-echo ""
-echo "running $0 to rebuild simgear include links"
-
-# toast the old directory
-rm -rf src/simgear
-mkdir src/simgear
-mkdir src/simgear/bucket
-mkdir src/simgear/debug
-mkdir src/simgear/math
-mkdir src/simgear/misc
-mkdir src/simgear/screen
-mkdir src/simgear/serial
-mkdir src/simgear/xgl
-mkdir src/simgear/zlib
-
-# build new links
-ln -s ../include/compiler.h src/simgear/compiler.h
-ln -s ../include/constants.h src/simgear/constants.h
-ln -s ../include/fg_traits.hxx src/simgear/fg_traits.hxx
-ln -s ../include/fg_zlib.h src/simgear/fg_zlib.h
-ln -s ../include/version.h src/simgear/version.h
-
-ln -s ../../bucket/newbucket.hxx src/simgear/bucket/newbucket.hxx
-
-ln -s ../../debug/debug_types.h src/simgear/debug/debug_types.h
-ln -s ../../debug/logstream.hxx src/simgear/debug/logstream.hxx
-
-ln -s ../../math/fg_memory.h src/simgear/math/fg_memory.h
-ln -s ../../math/fg_types.hxx src/simgear/math/fg_types.hxx
-ln -s ../../math/point3d.hxx src/simgear/math/point3d.hxx
-ln -s ../../math/polar3d.hxx src/simgear/math/polar3d.hxx
-
-ln -s ../../misc/fgpath.hxx src/simgear/misc/fgpath.hxx
-ln -s ../../misc/fgstream.hxx src/simgear/misc/fgstream.hxx
-ln -s ../../misc/zfstream.hxx src/simgear/misc/zfstream.hxx
-
-ln -s ../../xgl/xgl.h src/simgear/xgl/xgl.h
-
-ln -s ../../zlib/zlib.h src/simgear/zlib/zlib.h
-ln -s ../../zlib/zconf.h src/simgear/zlib/zconf.h

simgear/.cvsignore

@@ -4,4 +4,5 @@ simgear_config.h
 simgear_config.h.in
 stamp-h
 stamp-h.in
+stamp-h1
 version.h

simgear/Makefile.am

@@ -5,29 +5,33 @@ SGTHREAD_DIR =
 endif
 
 # METAR_DIRS =
-METAR_DIRS = metar
+METAR_DIRS = environment
 
 EXTRA_DIST = simgear_config.h.vc5 version.h.in
 
 include_HEADERS = \
-	compiler.h constants.h sg_inlines.h sg_traits.hxx sg_zlib.h version.h
+	compiler.h constants.h sg_inlines.h sg_traits.hxx version.h
 
 SUBDIRS = \
+	$(compatibility_DIR) \
 	xml \
 	debug \
 	misc \
+	structure \
 	bucket \
 	ephemeris \
 	io \
 	magvar \
 	math \
 	$(METAR_DIRS) \
+	nasal \
+	props \
 	route \
+	scene \
 	screen \
 	serial \
-	sky \
+	sound \
 	$(SGTHREAD_DIR) \
-	timing \
-	xgl
+	timing
 
-DIST_SUBDIRS = $(SUBDIRS) interpreter
+DIST_SUBDIRS = $(SUBDIRS) compatibility threads

simgear/bucket/newbucket.cxx

@@ -3,7 +3,7 @@
  *
  * Written by Curtis L. Olson, started February 1999.
  *
- * Copyright (C) 1999  Curtis L. Olson - curt@flightgear.org
+ * Copyright (C) 1999  Curtis L. Olson - http://www.flightgear.org/~curt/
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -24,6 +24,10 @@
  **************************************************************************/
 
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include <math.h>
 
 #include <simgear/misc/sg_path.hxx>
@@ -204,7 +208,7 @@ double SGBucket::get_width_m() const {
     double clat_rad = clat * SGD_DEGREES_TO_RADIANS;
     double cos_lat = cos( clat_rad );
     double local_radius = cos_lat * SG_EQUATORIAL_RADIUS_M;
-    double local_perimeter = 2.0 * local_radius * SGD_PI;
+    double local_perimeter = local_radius * SGD_2PI;
     double degree_width = local_perimeter / 360.0;
 
     return sg_bucket_span( get_center_lat() ) * degree_width;
@@ -213,7 +217,7 @@ double SGBucket::get_width_m() const {
 
 // return height of the tile in meters
 double SGBucket::get_height_m() const {
-    double perimeter = 2.0 * SG_EQUATORIAL_RADIUS_M * SGD_PI;
+    double perimeter = SG_EQUATORIAL_RADIUS_M * SGD_2PI;
     double degree_height = perimeter / 360.0;
 
     return SG_BUCKET_SPAN * degree_height;
@@ -267,16 +271,32 @@ void sgBucketDiff( const SGBucket& b1, const SGBucket& b2, int *dx, int *dy ) {
 #endif
 
     // longitude difference
-    double c1_lon = b1.get_center_lon();
-    double c2_lon = b2.get_center_lon();
-    double diff_lon = c2_lon - c1_lon;
-    double span;
-    if ( sg_bucket_span(c1_lat) <= sg_bucket_span(c2_lat) ) {
+    double diff_lon=0.0;
+    double span=0.0;
+
+    SGBucket tmp_bucket;
+    // To handle crossing the bucket size boundary
+    //  we need to account for different size buckets.
+
+    if ( sg_bucket_span(c1_lat) <= sg_bucket_span(c2_lat) )
+    {
 	span = sg_bucket_span(c1_lat);
     } else {
 	span = sg_bucket_span(c2_lat);
     }
 
+    diff_lon = b2.get_center_lon() - b1.get_center_lon();
+
+    if (diff_lon <0.0)
+    {
+       diff_lon -= b1.get_width()*0.5 + b2.get_width()*0.5 - span;
+    } 
+    else
+    {
+       diff_lon += b1.get_width()*0.5 + b2.get_width()*0.5 - span;
+    }
+
+
 #ifdef HAVE_RINT
     *dx = (int)rint( diff_lon / span );
 #else

simgear/bucket/newbucket.hxx

@@ -3,7 +3,7 @@
  *
  * Written by Curtis L. Olson, started February 1999.
  *
- * Copyright (C) 1999  Curtis L. Olson - curt@flightgear.org
+ * Copyright (C) 1999  Curtis L. Olson - http://www.flightgear.org/~curt
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -54,10 +54,7 @@ SG_USING_STD(fabs);
 #include STL_STRING
 
 SG_USING_STD(string);
-
-#if ! defined( SG_HAVE_NATIVE_SGI_COMPILERS )
 SG_USING_STD(ostream);
-#endif
 
 
 /**
@@ -260,14 +257,16 @@ public:
     // Informational methods.
 
     /**
-     * @return the lon of the lower left corner of this tile.
+     * @return the lon of the lower left corner of 
+     * the 1x1 chunk containing this tile.
      */
-    inline int get_lon() const { return lon; }
+    inline int get_chunk_lon() const { return lon; }
 
     /**
-     * @return the lat of the lower left corner of this tile.
+     * @return the lat of the lower left corner of 
+     * the 1x1 chunk containing this tile.
      */
-    inline int get_lat() const { return lat; }
+    inline int get_chunk_lat() const { return lat; }
 
     /**
      * @return the x coord within the 1x1 degree chunk this tile.

simgear/compatibility/.cvsignore

@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

simgear/compatibility/MIPSpro721/.cvsignore

@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

simgear/compatibility/MIPSpro721/Makefile.am

@@ -0,0 +1,14 @@
+includedir = @includedir@/compatibility/
+
+include_HEADERS	= \
+	iostream \
+	strstream \
+	sstream \
+	istream \
+	fstream \
+	iterator \
+	iomanip \
+	new \
+	streambuf \
+	\
+	irix_string

simgear/compatibility/MIPSpro721/fstream

@@ -0,0 +1,19 @@
+
+#ifndef __SG_FSTREAM
+#define __SG_FSTREAM 1
+
+# if defined(sgi) && !defined(__GNUC__)
+
+# include <fstream.h>
+
+  namespace std {
+    using ::fstream;
+    using ::ofstream;
+    using ::ifstream;
+  };
+
+
+# endif
+
+#endif // !__SG_FSTREAM
+

simgear/compatibility/MIPSpro721/iomanip

@@ -0,0 +1,16 @@
+
+#ifndef __SG_IOMANIP
+#define __SG_IOMANIP 1
+
+# include <iomanip.h>
+
+namespace std {
+
+   using ::setw;
+   using ::setprecision;
+
+   inline int  setfill(int f) { ::setfill(f); }
+};
+
+#endif // !__SG_IOMANIP
+

simgear/compatibility/MIPSpro721/iostream

@@ -0,0 +1,52 @@
+
+#ifndef __SG_IOSTREAM
+#define __SG_IOSTREAM 1
+
+# if defined(sgi) && !defined(__GNUC__)
+
+# include <fstream>
+# include <iostream.h>
+
+  class ios_base : public ios {
+  public:
+
+    typedef int  openmode;
+    typedef int  seekdir;
+
+    enum { binary = 0 };
+  };
+
+  namespace std {
+    using ::cin;
+    using ::cout;
+    using ::cerr;
+    using ::clog;
+    using ::endl;
+
+    using ::ios;
+    using ::ios_base;
+    using ::iostream;
+    using ::istream;
+    using ::ostream;
+
+    using ::dec;
+    using ::oct;
+    using ::hex;
+
+    enum  { skipws=ios::skipws,
+            left=ios::left, right=ios::right, internal=ios::internal,
+            showbase=ios::showbase, showpoint=ios::showpoint,
+            uppercase=ios::uppercase, showpos=ios::showpos,
+            scientific=ios::scientific, fixed=ios::fixed,
+            unitbuf=ios::unitbuf, stdio=ios::stdio
+#if _BOOL && __EDG_ABI_COMPATIBILITY_VERSION>227 /* bool support */
+            ,boolalpha=ios::boolalpha
+#endif /* bool support */
+          };
+
+  };
+
+# endif
+
+#endif // !__SG_IOSTREAM
+

simgear/compatibility/MIPSpro721/irix_string

@@ -0,0 +1,47 @@
+
+#ifndef __SGI_HXX
+#define __SGI_HXX 1
+
+#ifdef __cplusplus
+
+#include <string>
+
+inline bool
+operator!=( const std::string& lhs, const char* rhs)
+{
+    return lhs.compare( rhs ) != 0;
+}
+
+inline bool
+operator!=( const char* lhs, const std::string& rhs)
+{
+    return rhs.compare( lhs ) != 0;
+}
+
+inline bool
+operator==( const std::string& lhs, const char* rhs)
+{
+    return lhs.compare( rhs ) == 0;
+}
+
+inline bool
+operator==( const char* lhs, const std::string& rhs)
+{
+    return rhs.compare( lhs ) == 0;
+}
+
+inline std::string
+operator+(const std::string& lhs, const char* rhs)
+{
+    return lhs + std::string(rhs);
+}
+
+inline std::string
+operator+(const char* lhs, const std::string& rhs)
+{
+    return std::string(lhs) + rhs;
+}
+
+#endif /* __cplusplus */
+
+#endif /* !__SGI_HXX */

simgear/compatibility/MIPSpro721/istream

@@ -0,0 +1,17 @@
+
+#ifndef __SG_ISTREAM
+#define __SG_ISTREAM 1
+
+# include <iostream>
+
+# if defined(sgi) && !defined(__GNUC__)
+
+# include <stream.h>
+# include <string>
+
+  using std::getline;
+
+# endif
+
+#endif // !__SG_ISTREAM
+

simgear/compatibility/MIPSpro721/iterator

@@ -0,0 +1,8 @@
+
+#ifndef __SG_ITERATOR
+#define __SG_ITERATOR 1
+
+# include <iterator.h>
+
+#endif // !__SG_ITERATOR
+

simgear/compatibility/MIPSpro721/new

@@ -0,0 +1,12 @@
+
+#ifndef __SG_NEW
+#define __SG_NEW 1
+
+#if defined(sgi) && !defined(__GNUC__)
+
+# include <new.h>
+
+#endif
+
+#endif // !__SG_NEW
+

simgear/compatibility/MIPSpro721/sstream

@@ -0,0 +1,22 @@
+
+#ifndef __SG_SSTREAM
+#define __SG_SSTREAM 1
+
+# include <iostream>
+# include <strstream>
+# include <string>
+
+namespace std {
+
+   class ostringstream : public ostrstream {
+   public:
+      std::string str() {  return string(ostrstream::str()); }
+   };
+
+
+   typedef istrstream istringstream;
+
+};
+
+#endif // !__SG_SSTREAM
+

simgear/compatibility/MIPSpro721/streambuf

@@ -0,0 +1,38 @@
+
+#ifndef __SG_STREAMBUF
+#define __SG_STREAMBUF 1
+
+# include <iostream>
+# include <char_traits.h>
+
+//
+// Until we find a good way to rename the original streambuf class
+// and derive our own streambuf class from that, define this variable
+// for now so the code can inherit our streambuf class instead.
+//
+# define SG_NEED_STREAMBUF_HACK  1
+
+class __streambuf : virtual public streambuf {
+public:
+
+  typedef std::char_traits<char>            traits_type;
+  typedef std::char_traits<char>::int_type  int_type;
+
+  typedef streampos  pos_type;
+  typedef streamoff  off_type;
+};
+
+
+# if defined(sgi) && !defined(__GNUC__)
+
+# define pubsync  sync
+
+  namespace std {
+    using ::streambuf;
+    using ::streampos;
+    using ::streamoff;
+  };
+# endif
+
+#endif // !__SG_STREAMBUF
+

simgear/compatibility/MIPSpro721/strstream

@@ -0,0 +1,20 @@
+
+#ifndef __SG_STRSTREAM
+#define __SG_STRSTREAM 1
+
+# include <strstream.h>
+
+# if defined(sgi) && !defined(__GNUC__)
+
+  namespace std {
+    using ::ends;
+
+    using ::strstream;
+    using ::istrstream;
+    using ::ostrstream;
+  };
+
+# endif
+
+#endif // !__SG_STRSTREAM
+

simgear/compatibility/MIPSpro740/.cvsignore

@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

simgear/compatibility/MIPSpro740/Makefile.am

@@ -0,0 +1,22 @@
+includedir = @includedir@/compatibility
+
+EXTRA_DIST = README
+
+include_HEADERS	= \
+	cfloat \
+	csetjmp \
+	cstdio \
+	cwchar \
+	cassert \
+	climits \
+	csignal \
+	cstdlib \
+	cwctype \
+	cctype \
+	clocale \
+	cstdarg \
+	cstring \
+	cerrno \
+	cmath \
+	cstddef \
+	ctime

simgear/compatibility/MIPSpro740/README

@@ -0,0 +1,9 @@
+
+The following header files where taken from the boost clib package
+(http://www.boost.org):
+
+cassert climits  csignal   cstdlib   cwctype
+cctype  clocale  cstdarg   cstring
+cerrno  cmath    cstddef   ctime
+cfloat  csetjmp  cstdio    cwchar
+

simgear/compatibility/MIPSpro740/cassert

@@ -0,0 +1,10 @@
+// This file is automatically generated. Do not edit.
+// ['../../../libs/compatibility/generate_cpp_c_headers.py']
+// Mon Apr 16 15:16:00 2001 ('PST', 'PDT')
+
+#ifndef __CASSERT_HEADER
+#define __CASSERT_HEADER
+
+#include <assert.h>
+
+#endif // CASSERT_HEADER

simgear/compatibility/MIPSpro740/cctype

@@ -0,0 +1,26 @@
+// This file is automatically generated. Do not edit.
+// ['../../../libs/compatibility/generate_cpp_c_headers.py']
+// Mon Apr 16 15:16:00 2001 ('PST', 'PDT')
+
+#ifndef __CCTYPE_HEADER
+#define __CCTYPE_HEADER
+
+#include <ctype.h>
+
+namespace std {
+  using ::isalnum;
+  using ::isdigit;
+  using ::isprint;
+  using ::isupper;
+  using ::tolower;
+  using ::isalpha;
+  using ::isgraph;
+  using ::ispunct;
+  using ::isxdigit;
+  using ::toupper;
+  using ::iscntrl;
+  using ::islower;
+  using ::isspace;
+}
+
+#endif // CCTYPE_HEADER

simgear/compatibility/MIPSpro740/cerrno

@@ -0,0 +1,10 @@
+// This file is automatically generated. Do not edit.
+// ['../../../libs/compatibility/generate_cpp_c_headers.py']
+// Mon Apr 16 15:16:00 2001 ('PST', 'PDT')
+
+#ifndef __CERRNO_HEADER
+#define __CERRNO_HEADER
+
+#include <errno.h>
+
+#endif // CERRNO_HEADER

simgear/compatibility/MIPSpro740/cfloat

@@ -0,0 +1,10 @@
+// This file is automatically generated. Do not edit.
+// ['../../../libs/compatibility/generate_cpp_c_headers.py']
+// Mon Apr 16 15:16:00 2001 ('PST', 'PDT')
+
+#ifndef __CFLOAT_HEADER
+#define __CFLOAT_HEADER
+
+#include <float.h>
+
+#endif // CFLOAT_HEADER

simgear/compatibility/MIPSpro740/climits

@@ -0,0 +1,10 @@
+// This file is automatically generated. Do not edit.
+// ['../../../libs/compatibility/generate_cpp_c_headers.py']
+// Mon Apr 16 15:16:00 2001 ('PST', 'PDT')
+
+#ifndef __CLIMITS_HEADER
+#define __CLIMITS_HEADER
+
+#include <limits.h>
+
+#endif // CLIMITS_HEADER

simgear/compatibility/MIPSpro740/clocale

@@ -0,0 +1,16 @@
+// This file is automatically generated. Do not edit.
+// ['../../../libs/compatibility/generate_cpp_c_headers.py']
+// Mon Apr 16 15:16:00 2001 ('PST', 'PDT')
+
+#ifndef __CLOCALE_HEADER
+#define __CLOCALE_HEADER
+
+#include <locale.h>
+
+namespace std {
+  using ::lconv;
+  using ::localeconv;
+  using ::setlocale;
+}
+
+#endif // CLOCALE_HEADER

simgear/compatibility/MIPSpro740/cmath

@@ -0,0 +1,35 @@
+// This file is automatically generated. Do not edit.
+// ['../../../libs/compatibility/generate_cpp_c_headers.py']
+// Mon Apr 16 15:16:00 2001 ('PST', 'PDT')
+
+#ifndef __CMATH_HEADER
+#define __CMATH_HEADER
+
+#include <math.h>
+
+namespace std {
+  using ::acos;
+  using ::cos;
+  using ::fmod;
+  using ::modf;
+  using ::tan;
+  using ::asin;
+  using ::cosh;
+  using ::frexp;
+  using ::pow;
+  using ::tanh;
+  using ::atan;
+  using ::exp;
+  using ::ldexp;
+  using ::sin;
+  using ::atan2;
+  using ::fabs;
+  using ::log;
+  using ::sinh;
+  using ::ceil;
+  using ::floor;
+  using ::log10;
+  using ::sqrt;
+}
+
+#endif // CMATH_HEADER

simgear/compatibility/MIPSpro740/csetjmp

@@ -0,0 +1,15 @@
+// This file is automatically generated. Do not edit.
+// ['../../../libs/compatibility/generate_cpp_c_headers.py']
+// Mon Apr 16 15:16:00 2001 ('PST', 'PDT')
+
+#ifndef __CSETJMP_HEADER
+#define __CSETJMP_HEADER
+
+#include <setjmp.h>
+
+namespace std {
+  using ::jmp_buf;
+  using ::longjmp;
+}
+
+#endif // CSETJMP_HEADER

simgear/compatibility/MIPSpro740/csignal

@@ -0,0 +1,16 @@
+// This file is automatically generated. Do not edit.
+// ['../../../libs/compatibility/generate_cpp_c_headers.py']
+// Mon Apr 16 15:16:00 2001 ('PST', 'PDT')
+
+#ifndef __CSIGNAL_HEADER
+#define __CSIGNAL_HEADER
+
+#include <signal.h>
+
+namespace std {
+  using ::sig_atomic_t;
+  using ::raise;
+  using ::signal;
+}
+
+#endif // CSIGNAL_HEADER

simgear/compatibility/MIPSpro740/cstdarg

@@ -0,0 +1,14 @@
+// This file is automatically generated. Do not edit.
+// ['../../../libs/compatibility/generate_cpp_c_headers.py']
+// Mon Apr 16 15:16:00 2001 ('PST', 'PDT')
+
+#ifndef __CSTDARG_HEADER
+#define __CSTDARG_HEADER
+
+#include <stdarg.h>
+
+namespace std {
+  using ::va_list;
+}
+
+#endif // CSTDARG_HEADER

simgear/compatibility/MIPSpro740/cstddef

@@ -0,0 +1,15 @@
+// This file is automatically generated. Do not edit.
+// ['../../../libs/compatibility/generate_cpp_c_headers.py']
+// Mon Apr 16 15:16:00 2001 ('PST', 'PDT')
+
+#ifndef __CSTDDEF_HEADER
+#define __CSTDDEF_HEADER
+
+#include <stddef.h>
+
+namespace std {
+  using ::ptrdiff_t;
+  using ::size_t;
+}
+
+#endif // CSTDDEF_HEADER

simgear/compatibility/MIPSpro740/cstdio

@@ -0,0 +1,57 @@
+// This file is automatically generated. Do not edit.
+// ['../../../libs/compatibility/generate_cpp_c_headers.py']
+// Mon Apr 16 15:16:00 2001 ('PST', 'PDT')
+
+#ifndef __CSTDIO_HEADER
+#define __CSTDIO_HEADER
+
+#include <stdio.h>
+
+namespace std {
+  using ::FILE;
+  using ::fpos_t;
+  using ::size_t;
+  using ::clearerr;
+  using ::fgets;
+  using ::fscanf;
+  using ::gets;
+  using ::rename;
+  using ::tmpfile;
+  using ::fclose;
+  using ::fopen;
+  using ::fseek;
+  using ::perror;
+  using ::rewind;
+  using ::tmpnam;
+  using ::feof;
+  using ::fprintf;
+  using ::fsetpos;
+  using ::printf;
+  using ::scanf;
+  using ::ungetc;
+  using ::ferror;
+  using ::fputc;
+  using ::ftell;
+  using ::putc;
+  using ::setbuf;
+  using ::vfprintf;
+  using ::fflush;
+  using ::fputs;
+  using ::fwrite;
+  using ::putchar;
+  using ::setvbuf;
+  using ::vprintf;
+  using ::fgetc;
+  using ::fread;
+  using ::getc;
+  using ::puts;
+  using ::sprintf;
+  using ::vsprintf;
+  using ::fgetpos;
+  using ::freopen;
+  using ::getchar;
+  using ::remove;
+  using ::sscanf;
+}
+
+#endif // CSTDIO_HEADER

simgear/compatibility/MIPSpro740/cstdlib

@@ -0,0 +1,43 @@
+// This file is automatically generated. Do not edit.
+// ['../../../libs/compatibility/generate_cpp_c_headers.py']
+// Mon Apr 16 15:16:00 2001 ('PST', 'PDT')
+
+#ifndef __CSTDLIB_HEADER
+#define __CSTDLIB_HEADER
+
+#include <stdlib.h>
+
+namespace std {
+  using ::abort;
+  using ::atexit;
+  using ::exit;
+  using ::getenv;
+  using ::system;
+  using ::calloc;
+  using ::malloc;
+  using ::free;
+  using ::realloc;
+  using ::atol;
+  using ::mblen;
+  using ::strtod;
+  using ::wctomb;
+  using ::atof;
+  using ::mbstowcs;
+  using ::strtol;
+  using ::wcstombs;
+  using ::atoi;
+  using ::mbtowc;
+  using ::strtoul;
+  using ::bsearch;
+  using ::qsort;
+  using ::div_t;
+  using ::ldiv_t;
+  using ::abs;
+  using ::labs;
+  using ::srand;
+  using ::div;
+  using ::ldiv;
+  using ::rand;
+}
+
+#endif // CSTDLIB_HEADER

simgear/compatibility/MIPSpro740/cstring

@@ -0,0 +1,36 @@
+// This file is automatically generated. Do not edit.
+// ['../../../libs/compatibility/generate_cpp_c_headers.py']
+// Mon Apr 16 15:16:00 2001 ('PST', 'PDT')
+
+#ifndef __CSTRING_HEADER
+#define __CSTRING_HEADER
+
+#include <string.h>
+
+namespace std {
+  using ::size_t;
+  using ::memchr;
+  using ::strcat;
+  using ::strcspn;
+  using ::strncpy;
+  using ::strtok;
+  using ::memcmp;
+  using ::strchr;
+  using ::strerror;
+  using ::strpbrk;
+  using ::strxfrm;
+  using ::memcpy;
+  using ::strcmp;
+  using ::strlen;
+  using ::strrchr;
+  using ::memmove;
+  using ::strcoll;
+  using ::strncat;
+  using ::strspn;
+  using ::memset;
+  using ::strcpy;
+  using ::strncmp;
+  using ::strstr;
+}
+
+#endif // CSTRING_HEADER

simgear/compatibility/MIPSpro740/ctime

@@ -0,0 +1,26 @@
+// This file is automatically generated. Do not edit.
+// ['../../../libs/compatibility/generate_cpp_c_headers.py']
+// Mon Apr 16 15:16:00 2001 ('PST', 'PDT')
+
+#ifndef __CTIME_HEADER
+#define __CTIME_HEADER
+
+#include <time.h>
+
+namespace std {
+  using ::size_t;
+  using ::clock_t;
+  using ::time_t;
+  using ::tm;
+  using ::asctime;
+  using ::clock;
+  using ::difftime;
+  using ::localtime;
+  using ::strftime;
+  using ::ctime;
+  using ::gmtime;
+  using ::mktime;
+  using ::time;
+}
+
+#endif // CTIME_HEADER

simgear/compatibility/MIPSpro740/cwchar

@@ -0,0 +1,156 @@
+// This file is automatically generated. Do not edit.
+// ['../../../libs/compatibility/generate_cpp_c_headers.py']
+// Mon Apr 16 15:16:00 2001 ('PST', 'PDT')
+
+#ifndef __CWCHAR_HEADER
+#define __CWCHAR_HEADER
+
+#include <wchar.h>
+
+namespace std {
+  using ::mbstate_t;
+  using ::wint_t;
+  using ::size_t;
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::btowc;
+#endif
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+  using ::getwchar;
+#endif
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+  using ::ungetwc;
+#endif
+  using ::wcscpy;
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::wcsrtombs;
+#endif
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::wmemchr;
+#endif
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+  using ::fgetwc;
+#endif
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::mbrlen;
+#endif
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::vfwprintf;
+#endif
+#endif
+  using ::wcscspn;
+  using ::wcsspn;
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::wmemcmp;
+#endif
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+  using ::fgetws;
+#endif
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::mbrtowc;
+#endif
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::vswprintf;
+#endif
+#endif
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+  using ::wcsftime;
+#endif
+  using ::wcsstr;
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::wmemcpy;
+#endif
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+  using ::fputwc;
+#endif
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::mbsinit;
+#endif
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::vwprintf;
+#endif
+#endif
+  using ::wcslen;
+  using ::wcstod;
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::wmemmove;
+#endif
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+  using ::fputws;
+#endif
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::mbsrtowcs;
+#endif
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::wcrtomb;
+#endif
+  using ::wcsncat;
+  using ::wcstok;
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::wmemset;
+#endif
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+#if !(defined(__DECCXX_VER) && __DECCXX_VER <= 60290024)
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::fwide;
+#endif
+#endif
+#endif
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+  using ::putwc;
+#endif
+  using ::wcscat;
+  using ::wcsncmp;
+  using ::wcstol;
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::wprintf;
+#endif
+#endif
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::fwprintf;
+#endif
+#endif
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+  using ::putwchar;
+#endif
+  using ::wcschr;
+  using ::wcsncpy;
+  using ::wcstoul;
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::wscanf;
+#endif
+#endif
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::fwscanf;
+#endif
+#endif
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::swprintf;
+#endif
+#endif
+  using ::wcscmp;
+  using ::wcspbrk;
+  using ::wcsxfrm;
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+  using ::getwc;
+#endif
+#if !(defined(__linux) && defined(__DECCXX_VER) && __DECCXX_VER <= 60390005)
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::swscanf;
+#endif
+#endif
+  using ::wcscoll;
+  using ::wcsrchr;
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::wctob;
+#endif
+}
+
+#endif // CWCHAR_HEADER

simgear/compatibility/MIPSpro740/cwctype

@@ -0,0 +1,39 @@
+// This file is automatically generated. Do not edit.
+// ['../../../libs/compatibility/generate_cpp_c_headers.py']
+// Mon Apr 16 15:16:00 2001 ('PST', 'PDT')
+
+#ifndef __CWCTYPE_HEADER
+#define __CWCTYPE_HEADER
+
+#include <wctype.h>
+
+namespace std {
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::wctrans_t;
+#endif
+  using ::wctype_t;
+  using ::wint_t;
+  using ::iswalnum;
+  using ::iswctype;
+  using ::iswlower;
+  using ::iswspace;
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::towctrans;
+#endif
+#if !(defined(__sgi) && defined(_COMPILER_VERSION) && _COMPILER_VERSION <= 730)
+  using ::wctrans;
+#endif
+  using ::iswalpha;
+  using ::iswdigit;
+  using ::iswprint;
+  using ::iswupper;
+  using ::towlower;
+  using ::wctype;
+  using ::iswcntrl;
+  using ::iswgraph;
+  using ::iswpunct;
+  using ::iswxdigit;
+  using ::towupper;
+}
+
+#endif // CWCTYPE_HEADER

simgear/compatibility/Makefile.am

@@ -0,0 +1,3 @@
+SUBDIRS = $(MIPSpro_DIRS)
+
+DIST_SUBDIRS = MIPSpro721 MIPSpro740

simgear/compiler.h

@@ -121,7 +121,7 @@
 #      define STL_STRSTREAM  <strstream>
 
 #    endif
-#  elif __GNUC__ == 3
+#  elif __GNUC__ >= 3
        // g++-3.0.x
 #      define SG_EXPLICIT_FUNCTION_TMPL_ARGS
 #      define SG_NEED_AUTO_PTR
@@ -141,7 +141,6 @@
 #      define STL_STDEXCEPT  <stdexcept>
 #      define STL_STRING     <string>
 #      define STL_STRSTREAM  <strstream>
-
 #  else
 #    error Time to upgrade. GNU compilers < 2.7 not supported
 #  endif
@@ -150,12 +149,6 @@
 
 #endif // __GNUC__
 
-#if defined( __MINGW32__ )
-#  define bcopy(from, to, n) memcpy(to, from, n)
-#  define FG_MEM_COPY(to,from,n) memcpy(to, from, n)
-#  define snprintf _snprintf
-#endif
-
 /* KAI C++ */
 #if defined(__KCC)
 
@@ -220,7 +213,7 @@
 #  define bcopy(from, to, n) memcpy(to, from, n)
 #  define FG_MEM_COPY(to,from,n) memcpy(to, from, n)
 
-#  if _MSC_VER == 1200  // msvc++ 6.0
+#  if _MSC_VER >= 1200  // msvc++ 6.0 or greater
 #    define SG_NAMESPACES
 #    define SG_HAVE_STD
 #    define SG_HAVE_STD_INCLUDES
@@ -236,6 +229,7 @@
 #    define STL_STRING     <string>
 #    define STL_STRSTREAM  <strstream>
 
+#    define isnan _isnan
 #    define snprintf _snprintf
 
 #    pragma warning(disable: 4786) // identifier was truncated to '255' characters
@@ -292,42 +286,45 @@
 #  define SG_HAVE_NATIVE_SGI_COMPILERS
 
 #  define SG_EXPLICIT_FUNCTION_TMPL_ARGS
+#  define SG_CLASS_PARTIAL_SPECIALIZATION
 #  define SG_NEED_AUTO_PTR
 #  define SG_MEMBER_TEMPLATES
 #  define SG_NAMESPACES
 #  define SG_HAVE_STD
-#  define SG_CLASS_PARTIAL_SPECIALIZATION
+#  define SG_HAVE_STREAMBUF
 #  define SG_HAVE_TRAITS
+#  define SG_HAVE_STD_INCLUDES
 
 #  define STL_ALGORITHM  <algorithm>
 #  define STL_FUNCTIONAL <functional>
-#  define STL_IOMANIP    <iomanip.h>
-#  define STL_IOSTREAM   <iostream.h>
-#  define STL_ITERATOR   <iterator.h>
-#  define STL_FSTREAM    <fstream.h>
+#  define STL_IOMANIP    <iomanip>
+#  define STL_IOSTREAM   <iostream>
+#  define STL_ITERATOR   <iterator>
+#  define STL_FSTREAM    <fstream>
 #  define STL_STDEXCEPT  <stdexcept>
+#if (_COMPILER_VERSION < 740)
+#  define STL_STRING     <irix_string>
+#else
 #  define STL_STRING     <string>
-#  define STL_STRSTREAM  <strstream.h>
-
-// #  define __STL_FUNCTION_TMPL_PARTIAL_ORDER
-// typedef void PFNGLPOINTPARAMETERFEXTPROC
-
-#define glPointParameterfEXT	glPointParameterfSGIS
-#define glPointParameterfvEXT	glPointParameterfvSGIS
+#endif
+#  define STL_STRSTREAM  <strstream>
 
 #pragma set woff 1001,1012,1014,1116,1155,1172,1174
 #pragma set woff 1401,1460,1551,1552,1681
 
 #ifdef __cplusplus
 #pragma set woff 1682,3303
+#if (_COMPILER_VERSION >= 740)
+#  pragma set woff 3624
+#endif
 #endif
 
-#  define SG_COMPILER_STR "SGI Irix compiler version " SG_STRINGIZE(_COMPILER_VERSION)
+#  define SG_COMPILER_STR "SGI MipsPro compiler version " SG_STRINGIZE(_COMPILER_VERSION)
 
 #endif // Native SGI compilers
 
 
-#if defined ( sun )
+#if defined (__sun)
 #  include <strings.h>
 #  include <memory.h>
 #  if defined ( __cplusplus )
@@ -339,7 +336,9 @@
      extern void *memmove(void *, const void *, size_t);
 #  endif // __cplusplus
 
-#  define SG_COMPILER_STR "Sun compiler version " SG_STRINGIZE(__SUNPRO_CC)
+#  if  !defined( __GNUC__ )
+#   define SG_COMPILER_STR "Sun compiler version " SG_STRINGIZE(__SUNPRO_CC)
+#  endif
 
 #endif // sun
 
@@ -367,6 +366,27 @@
 
 #endif // __ICC
 
+//
+// Platform dependent gl.h and glut.h definitions
+//
+
+#ifdef __APPLE__
+#  define SG_GL_H <OpenGL/gl.h>
+#  define SG_GLX_H <AGL/agl.h>
+#  define SG_GLU_H <OpenGL/glu.h>
+#  define SG_GLEXT_H <OpenGL/glext.h>
+#  define SG_GLUT_H <GLUT/glut.h>
+
+inline int (isnan)(double r) { return !(r <= 0 || r >= 0); }
+#else
+#  define SG_GL_H <GL/gl.h>
+#  define SG_GLX_H <GL/glx.h>
+#  define SG_GLU_H <GL/glu.h>
+#  define SG_GLEXT_H <GL/glext.h>
+#  define SG_GLUT_H <GL/glut.h>
+#endif
+
+
 //
 // No user modifiable definitions beyond here.
 //
@@ -448,3 +468,4 @@ inline const_mem_fun_ref_t<_Ret,_Tp> mem_fun_ref(_Ret (_Tp::*__f)() const)
 #endif // SG_INCOMPLETE_FUNCTIONAL
 
 #endif // _SG_COMPILER_H
+

simgear/constants.h

@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started February 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson  - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt/
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -32,6 +32,9 @@
 
 #include <simgear/compiler.h>
 
+#ifdef _MSC_VER
+#  define  _USE_MATH_DEFINES
+#endif
 #ifdef SG_HAVE_STD_INCLUDES
 #  include <cmath>
 #else
@@ -106,21 +109,51 @@
 #define SG_METER_TO_FEET    3.28083989501312335958  
 
 /** Meters to Nautical Miles.  1 nm = 6076.11549 feet */
-#define SG_METER_TO_NM      0.00053995680
+#define SG_METER_TO_NM      0.0005399568034557235
 
 /** Nautical Miles to Meters */
 #define SG_NM_TO_METER      1852.0000
 
+/** Meters to Statute Miles. */
+#define SG_METER_TO_SM      0.0006213699494949496
+
+/** Statute Miles to Meters. */
+#define SG_SM_TO_METER      1609.3412196
+
 /** Radians to Nautical Miles.  1 nm = 1/60 of a degree */
 #define SG_NM_TO_RAD        0.00029088820866572159
 
 /** Nautical Miles to Radians */
 #define SG_RAD_TO_NM        3437.7467707849392526
 
+/** Miles per second to Knots */
+#define SG_MPS_TO_KT        1.9438444924406046432
+
+/** Knots to Miles per second */
+#define SG_KT_TO_MPS        0.5144444444444444444
+
+/** Miles per second to Miles per hour */
+#define SG_MPS_TO_MPH       2.2369362920544020312
+
+/** Miles per hour to Miles per second */
+#define SG_MPH_TO_MPS       0.44704
+
+/** Meters per second to Kilometers per hour */
+#define SG_MPS_TO_KMH       3.6
+
+/** Kilometers per hour to Miles per second */
+#define SG_KMH_TO_MPS       0.2777777777777777778
+
+/** Pascal to Inch Mercury */
+#define SG_PA_TO_INHG       0.0002952998330101010
+
+/** Inch Mercury to Pascal */
+#define SG_INHG_TO_PA       3386.388640341
+
+
 /** For divide by zero avoidance, this will be close enough to zero */
 #define SG_EPSILON 0.0000001
 
-
 /** Highest binobj format version we know how to read/write.  This starts at
  *  0 and can go up to 65535 */
 #define SG_BINOBJ_VERSION 6

simgear/debug/debug_types.h

@@ -23,7 +23,11 @@ typedef enum {
     SG_IO        = 0x00001000,
     SG_CLIPPER   = 0x00002000,
     SG_NETWORK   = 0x00004000,
-    SG_UNDEFD    = 0x00008000, // For range checking
+    SG_ATC       = 0x00008000,
+    SG_NASAL     = 0x00010000,
+    SG_INSTR     = 0x00020000,
+    SG_SYSTEMS   = 0x00040000,
+    SG_UNDEFD    = 0x00080000, // For range checking
 
     SG_ALL     = 0xFFFFFFFF
 } sgDebugClass;
@@ -33,11 +37,12 @@ typedef enum {
  * Define the possible logging priorities (and their order).
  */
 typedef enum {
-    SG_BULK,	    // For frequent messages
-    SG_DEBUG, 	    // Less frequent debug type messages
-    SG_INFO,        // Informatory messages
-    SG_WARN,	    // Possible impending problem
-    SG_ALERT       // Very possible impending problem
+    SG_BULK = 1,       // For frequent messages
+    SG_DEBUG,          // Less frequent debug type messages
+    SG_INFO,           // Informatory messages
+    SG_WARN,           // Possible impending problem
+    SG_ALERT           // Very possible impending problem
     // SG_EXIT,        // Problem (no core)
     // SG_ABORT        // Abandon ship (core)
 } sgDebugPriority;
+

simgear/debug/logstream.hxx

@@ -28,9 +28,8 @@
 
 #include <simgear/compiler.h>
 
-// At least Irix needs this
-#ifdef SG_HAVE_NATIVE_SGI_COMPILERS
-#include <char_traits.h>
+#ifdef _MSC_VER
+#  include <windows.h>
 #endif
 
 #ifdef SG_HAVE_STD_INCLUDES
@@ -43,14 +42,11 @@
 
 #include <simgear/debug/debug_types.h>
 
-#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 SG_USING_STD(streambuf);
 SG_USING_STD(ostream);
+SG_USING_STD(cout);
 SG_USING_STD(cerr);
 SG_USING_STD(endl);
-#else
-SG_USING_STD(char_traits);
-#endif
 
 #ifdef __MWERKS__
 SG_USING_STD(iostream);
@@ -69,7 +65,11 @@ SG_USING_STD(iostream);
  * messages at runtime. Only messages with priority >= logbuf::logPriority
  * and debugClass == logbuf::logClass are output.
  */
+#ifdef SG_NEED_STREAMBUF_HACK
+class logbuf : public __streambuf
+#else
 class logbuf : public streambuf
+#endif
 {
 public:
 
@@ -184,7 +184,23 @@ logbuf::set_log_state( sgDebugClass c, sgDebugPriority p )
 inline logbuf::int_type
 logbuf::overflow( int c )
 {
+#ifdef _MSC_VER
+    static bool has_console = false;
+    if ( logging_enabled ) {
+        if ( !has_console ) {
+            AllocConsole();
+            freopen("conin$", "r", stdin);
+            freopen("conout$", "w", stdout);
+            freopen("conout$", "w", stderr);
+            has_console = true;
+        }
+        sbuf->sputc(c);
+    }
+    else
+        return EOF == 0 ? 1: 0;
+#else
     return logging_enabled ? sbuf->sputc(c) : (EOF == 0 ? 1: 0);
+#endif
 }
 
 /**

simgear/environment/.cvsignore

@@ -0,0 +1,4 @@
+.deps
+Makefile
+Makefile.in
+metar

simgear/environment/Makefile.am

@@ -0,0 +1,9 @@
+includedir = @includedir@/environment
+
+lib_LIBRARIES = libsgenvironment.a
+
+include_HEADERS = metar.hxx visual_enviro.hxx
+
+libsgenvironment_a_SOURCES = metar.cxx visual_enviro.cxx
+
+INCLUDES = -I$(top_srcdir)

simgear/environment/metar.hxx

@@ -0,0 +1,282 @@
+// metar interface class
+//
+// Written by Melchior FRANZ, started December 2003.
+//
+// Copyright (C) 2003  Melchior FRANZ - mfranz@aon.at
+//
+// 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 the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+//
+// $Id$
+
+#ifndef _METAR_HXX
+#define _METAR_HXX
+
+#include <vector>
+#include <map>
+#include <string>
+
+#include <simgear/constants.h>
+
+SG_USING_STD(vector);
+SG_USING_STD(map);
+SG_USING_STD(string);
+
+const double SGMetarNaN = -1E20;
+#define NaN SGMetarNaN
+
+struct Token {
+	char	*id;
+	char	*text;
+};
+
+
+class SGMetar;
+
+class SGMetarVisibility {
+	friend class SGMetar;
+public:
+	SGMetarVisibility() :
+		_distance(NaN),
+		_direction(-1),
+		_modifier(EQUALS),
+		_tendency(NONE) {}
+
+	enum Modifier {
+		NOGO,
+		EQUALS,
+		LESS_THAN,
+		GREATER_THAN
+	};
+
+	enum Tendency {
+		NONE,
+		STABLE,
+		INCREASING,
+		DECREASING
+	};
+
+	void set(double dist, int dir = -1, int mod = -1, int tend = -1);
+
+	inline double	getVisibility_m()	const { return _distance; }
+	inline double	getVisibility_ft()	const { return _distance == NaN ? NaN : _distance * SG_METER_TO_FEET; }
+	inline double	getVisibility_sm()	const { return _distance == NaN ? NaN : _distance * SG_METER_TO_SM; }
+	inline int	getDirection()		const { return _direction; }
+	inline int	getModifier()		const { return _modifier; }
+	inline int	getTendency()		const { return _tendency; }
+
+protected:
+	double	_distance;
+	int	_direction;
+	int	_modifier;
+	int	_tendency;
+};
+
+
+// runway condition (surface and visibility)
+class SGMetarRunway {
+	friend class SGMetar;
+public:
+	SGMetarRunway() :
+		_deposit(-1),
+		_deposit_string(0),
+		_extent(-1),
+		_extent_string(0),
+		_depth(NaN),
+		_friction(NaN),
+		_friction_string(0),
+		_comment(0),
+		_wind_shear(false) {}
+
+	inline int			getDeposit()		const { return _deposit; }
+	inline const char		*getDepositString()	const { return _deposit_string; }
+	inline double			getExtent()		const { return _extent; }
+	inline const char		*getExtentString()	const { return _extent_string; }
+	inline double			getDepth()		const { return _depth; }
+	inline double			getFriction()		const { return _friction; }
+	inline const char		*getFrictionString()	const { return _friction_string; }
+	inline const char		*getComment()		const { return _comment; }
+	inline const bool		getWindShear()		const { return _wind_shear; }
+	inline const SGMetarVisibility&	getMinVisibility()	const { return _min_visibility; }
+	inline const SGMetarVisibility&	getMaxVisibility()	const { return _max_visibility; }
+
+protected:
+	SGMetarVisibility _min_visibility;
+	SGMetarVisibility _max_visibility;
+	int		_deposit;
+	const char	*_deposit_string;
+	int		_extent;
+	const char	*_extent_string;
+	double		_depth;
+	double		_friction;
+	const char	*_friction_string;
+	const char	*_comment;
+	bool		_wind_shear;
+};
+
+
+// cloud layer
+class SGMetarCloud {
+	friend class SGMetar;
+public:
+	SGMetarCloud() :
+		_coverage(-1),
+		_altitude(NaN),
+		_type(0),
+		_type_long(0) {}
+
+	void set(double alt, int cov = -1);
+
+	inline int	getCoverage()		const { return _coverage; }
+	inline double	getAltitude_m()		const { return _altitude; }
+	inline double	getAltitude_ft()	const { return _altitude == NaN ? NaN : _altitude * SG_METER_TO_FEET; }
+	inline char	*getTypeString()	const { return _type; }
+	inline char	*getTypeLongString()	const { return _type_long; }
+
+protected:
+	int	_coverage;		// quarters: 0 -> clear ... 4 -> overcast
+	double	_altitude;		// 1000 m
+	char	*_type;			// CU
+	char	*_type_long;		// cumulus
+};
+
+
+class SGMetar {
+public:
+	SGMetar(const string& m, const string& proxy = "", const string& port = "",
+			const string &auth = "", const time_t time = 0);
+	~SGMetar();
+
+	enum ReportType {
+		NONE,
+		AUTO,
+		COR,
+		RTD
+	};
+
+	inline const char *getData()		const { return _data; }
+	inline const char *getUnusedData()	const { return _m; }
+	inline const bool getProxy()		const { return _x_proxy; }
+	inline const char *getId()		const { return _icao; }
+	inline int	getYear()		const { return _year; }
+	inline int	getMonth()		const { return _month; }
+	inline int	getDay()		const { return _day; }
+	inline int	getHour()		const { return _hour; }
+	inline int	getMinute()		const { return _minute; }
+	inline int	getReportType()		const { return _report_type; }
+
+	inline int	getWindDir()		const { return _wind_dir; }
+	inline double	getWindSpeed_mps()	const { return _wind_speed; }
+	inline double	getWindSpeed_kmh()	const { return _wind_speed == NaN ? NaN : _wind_speed * SG_MPS_TO_KMH; }
+	inline double	getWindSpeed_kt()	const { return _wind_speed == NaN ? NaN : _wind_speed * SG_MPS_TO_KT; }
+	inline double	getWindSpeed_mph()	const { return _wind_speed == NaN ? NaN : _wind_speed * SG_MPS_TO_MPH; }
+
+	inline double	getGustSpeed_mps()	const { return _gust_speed; }
+	inline double	getGustSpeed_kmh()	const { return _gust_speed == NaN ? NaN : _gust_speed * SG_MPS_TO_KMH; }
+	inline double	getGustSpeed_kt()	const { return _gust_speed == NaN ? NaN : _gust_speed * SG_MPS_TO_KT; }
+	inline double	getGustSpeed_mph()	const { return _gust_speed == NaN ? NaN : _gust_speed * SG_MPS_TO_MPH; }
+
+	inline int	getWindRangeFrom()	const { return _wind_range_from; }
+	inline int	getWindRangeTo()	const { return _wind_range_to; }
+
+	inline const SGMetarVisibility& getMinVisibility()	const { return _min_visibility; }
+	inline const SGMetarVisibility& getMaxVisibility()	const { return _max_visibility; }
+	inline const SGMetarVisibility& getVertVisibility()	const { return _vert_visibility; }
+	inline const SGMetarVisibility *getDirVisibility()	const { return _dir_visibility; }
+
+	inline double	getTemperature_C()	const { return _temp; }
+	inline double	getTemperature_F()	const { return _temp == NaN ? NaN : 1.8 * _temp + 32; }
+	inline double	getDewpoint_C()		const { return _dewp; }
+	inline double	getDewpoint_F()		const { return _dewp == NaN ? NaN : 1.8 * _dewp + 32; }
+	inline double	getPressure_hPa()	const { return _pressure == NaN ? NaN : _pressure / 100; }
+	inline double	getPressure_inHg()	const { return _pressure == NaN ? NaN : _pressure * SG_PA_TO_INHG; }
+
+	inline int	getRain()		const { return _rain; }
+	inline int	getHail()		const { return _hail; }
+	inline int	getSnow()		const { return _snow; }
+	inline bool	getCAVOK()		const { return _cavok; }
+
+	double		getRelHumidity()	const;
+
+	inline const vector<SGMetarCloud>& getClouds()	const	{ return _clouds; }
+	inline const map<string, SGMetarRunway>& getRunways()	const	{ return _runways; }
+	inline const vector<string>& getWeather()		const	{ return _weather; }
+
+protected:
+	string	_url;
+	int	_grpcount;
+	bool	_x_proxy;
+	char	*_data;
+	char	*_m;
+	char	_icao[5];
+	int	_year;
+	int	_month;
+	int	_day;
+	int	_hour;
+	int	_minute;
+	int	_report_type;
+	int	_wind_dir;
+	double	_wind_speed;
+	double	_gust_speed;
+	int	_wind_range_from;
+	int	_wind_range_to;
+	double	_temp;
+	double	_dewp;
+	double	_pressure;
+	int	_rain;
+	int	_hail;
+	int	_snow;
+	bool	_cavok;
+
+	SGMetarVisibility		_min_visibility;
+	SGMetarVisibility		_max_visibility;
+	SGMetarVisibility		_vert_visibility;
+	SGMetarVisibility		_dir_visibility[8];
+	vector<SGMetarCloud>		_clouds;
+	map<string, SGMetarRunway>	_runways;
+	vector<string>			_weather;
+
+	bool	scanPreambleDate();
+	bool	scanPreambleTime();
+	void	useCurrentDate();
+
+	bool	scanType();
+	bool	scanId();
+	bool	scanDate();
+	bool	scanModifier();
+	bool	scanWind();
+	bool	scanVariability();
+	bool	scanVisibility();
+	bool	scanRwyVisRange();
+	bool	scanSkyCondition();
+	bool	scanWeather();
+	bool	scanTemperature();
+	bool	scanPressure();
+	bool	scanRunwayReport();
+	bool	scanWindShear();
+	bool	scanTrendForecast();
+	bool	scanColorState();
+	bool	scanRemark();
+	bool	scanRemainder();
+
+	int	scanNumber(char **str, int *num, int min, int max = 0);
+	bool	scanBoundary(char **str);
+	const struct Token *scanToken(char **str, const struct Token *list);
+	char	*loadData(const char *id, const string& proxy, const string& port,
+			const string &auth, time_t time);
+	void	normalizeData();
+};
+
+#undef NaN
+#endif // _METAR_HXX

simgear/environment/visual_enviro.cxx

@@ -0,0 +1,698 @@
+// Visual environment helper class
+//
+// Written by Harald JOHNSEN, started April 2005.
+//
+// Copyright (C) 2005  Harald JOHNSEN - hjohnsen@evc.net
+//
+// 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 the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+//
+//
+
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
+#include <plib/sg.h>
+#include <simgear/constants.h>
+#include <simgear/math/sg_random.h>
+#include <simgear/math/sg_geodesy.hxx>
+#include <simgear/math/point3d.hxx>
+#include <simgear/math/polar3d.hxx>
+#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/scene/sky/cloudfield.hxx>
+#include <simgear/scene/sky/newcloud.hxx>
+#include "visual_enviro.hxx"
+
+#include <vector>
+
+SG_USING_STD(vector);
+
+
+typedef struct {
+	Point3D		pt;
+	int			depth;
+	int			prev;
+} lt_tree_seg;
+
+#define MAX_RAIN_SLICE	200
+static float rainpos[MAX_RAIN_SLICE];
+#define MAX_LT_TREE_SEG	400
+
+/**
+ * A class to render lightnings.
+ */
+class SGLightning {
+public:
+    /**
+     * Build a new lightning.
+     * The lightning has a limited life time. It will also play a thunder sounder once.
+     * @param lon lon longitude in degree
+     * @param lat lat latitude in degree
+     * @param alt asl of top of lightning
+     */
+	SGLightning(double lon, double lat, double alt);
+	~SGLightning();
+	void lt_Render(void);
+	void lt_build(void);
+	void lt_build_tree_branch(int tree_nr, Point3D &start, float energy, int nbseg, float segsize);
+
+	// contains all the segments of the lightning
+	lt_tree_seg lt_tree[MAX_LT_TREE_SEG];
+	// segment count
+	int		nb_tree;
+	// position of lightning
+	double	lon, lat, alt;
+	int		sequence_count;
+	// time to live
+	double	age;
+};
+
+typedef vector<SGLightning *> list_of_lightning;
+static list_of_lightning lightnings;
+
+SGEnviro sgEnviro;
+
+SGEnviro::SGEnviro(void) :
+	view_in_cloud(false),
+	turbulence_enable_state(false),
+	precipitation_enable_state(true),
+	lightning_enable_state(false),
+	soundMgr(NULL),
+	snd_active(false),
+	snd_dist(0.0),
+	last_cloud_turbulence(0.0),
+	cloud_turbulence(0.0),
+	elapsed_time(0.0),
+	dt(0.0),
+	min_time_before_lt(0.0),
+	fov_width(55.0),
+	fov_height(55.0),
+	precipitation_max_alt(0.0),
+	precipitation_density(100.0)
+
+{
+	for(int i = 0; i < MAX_RAIN_SLICE ; i++)
+		rainpos[i] = sg_random();
+	radarEcho.reserve(100);
+}
+
+SGEnviro::~SGEnviro(void) {
+	list_of_lightning::iterator iLightning;
+	for( iLightning = lightnings.begin() ; iLightning != lightnings.end() ; iLightning++ ) {
+		delete (*iLightning);
+	}
+	lightnings.clear();
+}
+
+void SGEnviro::startOfFrame( sgVec3 p, sgVec3 up, double lon, double lat, double alt, double delta_time) {
+	view_in_cloud = false;
+	// ask the impostor cache to do some cleanup
+	if(SGNewCloud::cldCache)
+		SGNewCloud::cldCache->startNewFrame();
+	last_cloud_turbulence = cloud_turbulence;
+	cloud_turbulence = 0.0;
+	elapsed_time += delta_time;
+	min_time_before_lt -= delta_time;
+	dt = delta_time;
+
+	sgMat4 T1, LON, LAT;
+    sgVec3 axis;
+
+    sgMakeTransMat4( T1, p );
+
+    sgSetVec3( axis, 0.0, 0.0, 1.0 );
+    sgMakeRotMat4( LON, lon, axis );
+
+    sgSetVec3( axis, 0.0, 1.0, 0.0 );
+    sgMakeRotMat4( LAT, 90.0 - lat, axis );
+
+    sgMat4 TRANSFORM;
+
+    sgCopyMat4( TRANSFORM, T1 );
+    sgPreMultMat4( TRANSFORM, LON );
+    sgPreMultMat4( TRANSFORM, LAT );
+
+    sgCoord pos;
+    sgSetCoord( &pos, TRANSFORM );
+
+	sgMakeCoordMat4( transform, &pos );
+    last_lon = lon;
+    last_lat = lat;
+	last_alt = alt;
+
+	radarEcho.clear();
+	precipitation_max_alt = 400.0;
+}
+
+void SGEnviro::endOfFrame(void) {
+}
+
+double SGEnviro::get_cloud_turbulence(void) const {
+	return last_cloud_turbulence;
+}
+
+// this can be queried to add some turbulence for example
+bool SGEnviro::is_view_in_cloud(void) const {
+	return view_in_cloud;
+}
+void SGEnviro::set_view_in_cloud(bool incloud) {
+	view_in_cloud = incloud;
+}
+
+int SGEnviro::get_CacheResolution(void) const {
+	return SGCloudField::get_CacheResolution();
+}
+
+int SGEnviro::get_clouds_CacheSize(void) const {
+	return SGCloudField::get_CacheSize();
+}
+float SGEnviro::get_clouds_visibility(void) const {
+	return SGCloudField::get_CloudVis();
+}
+float SGEnviro::get_clouds_density(void) const {
+	return SGCloudField::get_density();
+}
+bool SGEnviro::get_clouds_enable_state(void) const {
+	return SGCloudField::get_enable3dClouds();
+}
+
+bool SGEnviro::get_turbulence_enable_state(void) const {
+	return turbulence_enable_state;
+}
+
+void SGEnviro::set_CacheResolution(int resolutionPixels) {
+	SGCloudField::set_CacheResolution(resolutionPixels);
+}
+
+void SGEnviro::set_clouds_CacheSize(int sizeKb) {
+	SGCloudField::set_CacheSize(sizeKb);
+}
+void SGEnviro::set_clouds_visibility(float distance) {
+	SGCloudField::set_CloudVis(distance);
+}
+void SGEnviro::set_clouds_density(float density) {
+	SGCloudField::set_density(density);
+}
+void SGEnviro::set_clouds_enable_state(bool enable) {
+	SGCloudField::set_enable3dClouds(enable);
+}
+void SGEnviro::set_turbulence_enable_state(bool enable) {
+	turbulence_enable_state = enable;
+}
+// rain/snow
+float SGEnviro::get_precipitation_density(void) const {
+	return precipitation_density;
+}
+bool SGEnviro::get_precipitation_enable_state(void) const {
+	return precipitation_enable_state;
+}
+
+void SGEnviro::set_precipitation_density(float density) {
+	precipitation_density = density;
+}
+void SGEnviro::set_precipitation_enable_state(bool enable) {
+	precipitation_enable_state = enable;
+}
+
+// others
+bool SGEnviro::get_lightning_enable_state(void) const {
+	return lightning_enable_state;
+}
+
+void SGEnviro::set_lightning_enable_state(bool enable) {
+	lightning_enable_state = enable;
+	if( ! enable ) {
+		// TODO:cleanup
+	}
+}
+
+void SGEnviro::setLight(sgVec4 adj_fog_color) {
+	sgCopyVec4( fog_color, adj_fog_color );
+	if( false ) {
+	//    ssgGetLight( 0 ) -> setColour( GL_DIFFUSE, l->scene_diffuse() );
+	}
+}
+
+void SGEnviro::callback_cloud(float heading, float alt, float radius, int familly, float dist, int cloudId) {
+	// send data to wx radar
+	// compute turbulence
+	// draw precipitation
+	// draw lightning
+	// compute illumination
+
+	// http://www.pilotfriend.com/flight_training/weather/THUNDERSTORM%20HAZARDS1.htm
+	double turbulence = 0.0;
+	if( dist < radius * radius * 2.25f ) {
+		switch(familly) {
+			case SGNewCloud::CLFamilly_st:
+				turbulence = 0.2;
+				break;
+			case SGNewCloud::CLFamilly_ci:
+			case SGNewCloud::CLFamilly_cs:
+			case SGNewCloud::CLFamilly_cc:
+			case SGNewCloud::CLFamilly_ac:
+			case SGNewCloud::CLFamilly_as:
+				turbulence = 0.1;
+				break;
+			case SGNewCloud::CLFamilly_sc:
+				turbulence = 0.3;
+				break;
+			case SGNewCloud::CLFamilly_ns:
+				turbulence = 0.4;
+				break;
+			case SGNewCloud::CLFamilly_cu:
+				turbulence = 0.5;
+				break;
+			case SGNewCloud::CLFamilly_cb:
+				turbulence = 0.6;
+				break;
+		}
+		// full turbulence inside cloud, half in the vicinity
+		if( dist > radius * radius )
+			turbulence *= 0.5;
+		if( turbulence > cloud_turbulence )
+			cloud_turbulence = turbulence;
+		// we can do 'local' precipitations too
+	}
+
+	// convert to LWC for radar (experimental)
+	// http://www-das.uwyo.edu/~geerts/cwx/notes/chap08/moist_cloud.html
+	double LWC = 0.0;
+	switch(familly) {
+		case SGNewCloud::CLFamilly_st:
+			LWC = 0.29;
+			break;
+		case SGNewCloud::CLFamilly_cu:
+			LWC = 0.27;
+			break;
+		case SGNewCloud::CLFamilly_cb:
+			LWC = 2.0;
+			break;
+		case SGNewCloud::CLFamilly_sc:
+			LWC = 0.44;
+			break;
+		case SGNewCloud::CLFamilly_ci:
+			LWC = 0.03;
+			break;
+		// no data
+		case SGNewCloud::CLFamilly_cs:
+		case SGNewCloud::CLFamilly_cc:
+		case SGNewCloud::CLFamilly_ac:
+		case SGNewCloud::CLFamilly_as:
+			LWC = 0.03;
+			break;
+		case SGNewCloud::CLFamilly_ns:
+			LWC = 0.29*2.0;
+			break;
+	}
+	// add to the list for the wxRadar instrument
+	if( LWC > 0.0 )
+		radarEcho.push_back( SGWxRadarEcho ( heading, alt, radius, dist, LWC, false, cloudId ) );
+
+	// NB:data valid only from cockpit view
+
+	// spawn a new lightning
+	if(lightning_enable_state && min_time_before_lt <= 0.0 && (familly == SGNewCloud::CLFamilly_cb) &&
+		dist < 15000.0 * 15000.0 && sg_random() > 0.9f) {
+		double lat, lon;
+		Point3D orig, dest;
+		orig.setlat(last_lat * SG_DEGREES_TO_RADIANS );
+		orig.setlon(last_lon * SG_DEGREES_TO_RADIANS );
+		orig.setelev(0.0);
+		dist = sgSqrt(dist);
+		dest = calc_gc_lon_lat(orig, heading, dist);
+		lon = dest.lon() * SG_RADIANS_TO_DEGREES;
+		lat = dest.lat() * SG_RADIANS_TO_DEGREES;
+		addLightning( lon, lat, alt );
+
+		// reset timer
+		min_time_before_lt = 5.0 + sg_random() * 30;
+		// DEBUG only
+//		min_time_before_lt = 5.0;
+	}
+	if( (alt - radius * 0.1) > precipitation_max_alt )
+		switch(familly) {
+			case SGNewCloud::CLFamilly_st:
+			case SGNewCloud::CLFamilly_cu:
+			case SGNewCloud::CLFamilly_cb:
+			case SGNewCloud::CLFamilly_ns:
+			case SGNewCloud::CLFamilly_sc:
+				precipitation_max_alt = alt - radius * 0.1;
+				break;
+		}
+}
+
+list_of_SGWxRadarEcho *SGEnviro::get_radar_echo(void) {
+	return &radarEcho;
+}
+
+// precipitation rendering code
+void SGEnviro::DrawCone2(float baseRadius, float height, int slices, bool down, double rain_norm, double speed) {
+
+	sgVec3 light;
+	sgVec3 min_light = {0.35, 0.35, 0.35};
+	sgAddVec3( light, fog_color, min_light );
+	float da = SG_PI * 2.0f / (float) slices;
+	// low number = faster
+	float speedf = 2.5f - speed / 200.0;
+	if( speedf < 1.0f )
+		speedf = 1.0f;
+	float lenf = 0.03f + speed / 2000.0;
+	if( lenf > 0.10f )
+		lenf = 0.10f;
+    float t = fmod((float) elapsed_time, speedf) / speedf;
+//	t = 0.1f;
+	if( !down )
+		t = 1.0f - t;
+	float angle = 0.0f;
+	glColor4f(1.0f, 0.7f, 0.7f, 0.9f);
+	glBegin(GL_LINES);
+	int rainpos_indice = 0;
+	for( int i = 0 ; i < slices ; i++ ) {
+		float x = cos(angle) * baseRadius;
+		float y = sin(angle) * baseRadius;
+		angle += da;
+		sgVec3 dir = {x, -height, y};
+
+		// rain drops at 2 different speed to simulate depth
+		float t1 = (i & 1 ? t : t + t) + rainpos[rainpos_indice];
+		if(t1 > 1.0f)	t1 -= 1.0f;
+		if(t1 > 1.0f)	t1 -= 1.0f;
+
+		// distant raindrops are more transparent
+		float c = (i & 1 ? t1 * 0.5f : t1 * 0.9f);
+		glColor4f(c * light[0], c * light[1], c * light[2], c);
+		sgVec3 p1, p2;
+		sgScaleVec3(p1, dir, t1);
+		// distant raindrops are shorter
+		float t2 = t1 + (i & 1 ? lenf : lenf+lenf);
+		sgScaleVec3(p2, dir, t2);
+
+		glVertex3f(p1[0], p1[1] + height, p1[2]);
+		glVertex3f(p2[0], p2[1] + height, p2[2]);
+		if( ++rainpos_indice >= MAX_RAIN_SLICE )
+			rainpos_indice = 0;
+	}
+	glEnd();
+}
+
+void SGEnviro::drawRain(double pitch, double roll, double heading, double speed, double rain_norm) {
+
+	glBindTexture(GL_TEXTURE_2D, 0);
+
+	glDisable(GL_DEPTH_TEST);
+	glShadeModel(GL_SMOOTH);
+	glEnable(GL_BLEND);
+	glBlendFunc( GL_ONE, GL_ONE_MINUS_SRC_ALPHA );
+	glDisable( GL_FOG );
+	glDisable(GL_LIGHTING);
+
+	int slice_count = (40.0 + rain_norm*150.0)* precipitation_density / 100.0;
+
+	float angle = speed;
+	if( angle > 90.0 )
+		angle = 90.0;
+
+	glPushMatrix();
+		// TODO:find the real view orientation, not the AC one
+		// the cone rotate with speed
+		angle = -pitch - angle;
+		glRotatef(angle, 1.0, 0.0, 0.0);
+		glRotatef(roll, 0.0, 1.0, 0.0);
+		glRotatef(heading, 0.0, 0.0, 1.0);
+
+		// up cone
+		DrawCone2(15.0, 30.0, slice_count, true, rain_norm, speed);
+		// down cone (usually not visible)
+		if(angle > 0.0 || heading != 0.0)
+			DrawCone2(15.0, -30.0, slice_count, false, rain_norm, speed);
+
+	glPopMatrix();
+
+	glEnable(GL_LIGHTING);
+	glBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ;
+	glEnable( GL_FOG );
+	glEnable(GL_DEPTH_TEST);
+
+}
+
+void SGEnviro::set_soundMgr(SGSoundMgr *mgr) {
+	soundMgr = mgr;
+}
+
+void SGEnviro::drawPrecipitation(double rain_norm, double snow_norm, double hail_norm, double pitch, double roll, double heading, double speed) {
+	if( precipitation_enable_state && rain_norm > 0.0)
+	  if( precipitation_max_alt >= last_alt )
+		drawRain(pitch, roll, heading, speed, rain_norm);
+}
+
+
+SGLightning::SGLightning(double _lon, double _lat, double _alt) :
+	lon(_lon),
+	lat(_lat),
+	alt(_alt),
+	age(1.0 + sg_random() * 4.0),
+	nb_tree(0)
+{
+//	sequence_count = 1 + sg_random() * 5.0;
+	lt_build();
+}
+
+SGLightning::~SGLightning() {
+}
+
+// lightning rendering code
+void SGLightning::lt_build_tree_branch(int tree_nr, Point3D &start, float energy, int nbseg, float segsize) {
+
+	sgVec3 dir, newdir;
+	int nseg = 0;
+	Point3D pt = start;
+	if( nbseg == 50 )
+		sgSetVec3( dir, 0.0, -1.0, 0.0 );
+	else {
+		sgSetVec3( dir, sg_random() - 0.5f, sg_random() - 0.5f, sg_random() - 0.5f);
+		sgNormaliseVec3(dir);
+	}
+	if( nb_tree >= MAX_LT_TREE_SEG )
+		return;
+
+	lt_tree[nb_tree].depth = tree_nr;
+	nseg = 0;
+	lt_tree[nb_tree].pt = pt;
+	lt_tree[nb_tree].prev = -1;
+	nb_tree ++;
+
+	// TODO:check agl
+	while(nseg < nbseg && pt.y() > 0.0) {
+        int prev = nb_tree - 1;
+        nseg++;
+		// add a branch
+        if( energy * sg_random() > 0.8f )
+			lt_build_tree_branch(tree_nr + 1, pt, energy * 0.9f, nbseg == 50 ? 10 : nbseg * 0.4f, segsize * 0.7f);
+
+		if( nb_tree >= MAX_LT_TREE_SEG )
+			return;
+		sgSetVec3(newdir, (sg_random() - 0.5f), (sg_random() - 0.5f) - (nbseg == 50 ? 0.5f : 0.0), (sg_random() - 0.5f));
+		sgNormaliseVec3(newdir);
+		sgAddVec3( dir, newdir);
+		sgNormaliseVec3(dir);
+		sgVec3 scaleDir;
+		sgScaleVec3( scaleDir, dir, segsize * energy * 0.5f );
+		pt[PX] += scaleDir[0];
+		pt[PY] += scaleDir[1];
+		pt[PZ] += scaleDir[2];
+
+		lt_tree[nb_tree].depth = tree_nr;
+		lt_tree[nb_tree].pt = pt;
+		lt_tree[nb_tree].prev = prev;
+		nb_tree ++;
+	}
+}
+
+void SGLightning::lt_build(void) {
+    Point3D top;
+    nb_tree = 0;
+    top[PX] = 0 ;
+    top[PY] = alt;
+    top[PZ] = 0;
+    lt_build_tree_branch(0, top, 1.0, 50, top[PY] / 8.0);
+	if( ! sgEnviro.soundMgr )
+		return;
+	Point3D start( sgEnviro.last_lon*SG_DEGREES_TO_RADIANS, sgEnviro.last_lat*SG_DEGREES_TO_RADIANS, 0.0 );
+	Point3D dest( lon*SG_DEGREES_TO_RADIANS, lat*SG_DEGREES_TO_RADIANS, 0.0 );
+	double course = 0.0, dist = 0.0;
+	calc_gc_course_dist( dest, start, &course, &dist );
+	if( dist < 10000.0 && ! sgEnviro.snd_playing && (dist < sgEnviro.snd_dist || ! sgEnviro.snd_active) ) {
+		sgEnviro.snd_timer = 0.0;
+		sgEnviro.snd_wait  = dist / 340;
+		sgEnviro.snd_dist  = dist;
+		sgEnviro.snd_pos_lat = lat;
+		sgEnviro.snd_pos_lon = lon;
+		sgEnviro.snd_active = true;
+		sgEnviro.snd_playing = false;
+	}
+}
+
+
+void SGLightning::lt_Render(void) {
+	float flash = 0.5;
+	if( fmod(sgEnviro.elapsed_time*100.0, 100.0) > 50.0 )
+		flash = sg_random() * 0.75f + 0.25f;
+    float h = lt_tree[0].pt[PY];
+	sgVec4 col={0.62f, 0.83f, 1.0f, 1.0f};
+	sgVec4 c;
+
+#define DRAW_SEG() \
+			{glBegin(GL_LINES); \
+				glColor4fv(c); \
+                glVertex3f(lt_tree[n].pt[PX], lt_tree[n].pt[PZ], lt_tree[n].pt[PY]); \
+                glVertex3f(lt_tree[lt_tree[n].prev].pt[PX], lt_tree[lt_tree[n].prev].pt[PZ], lt_tree[lt_tree[n].prev].pt[PY]); \
+			glEnd();}
+
+	glDepthMask( GL_FALSE );
+	glEnable(GL_BLEND);
+	glBlendFunc( GL_DST_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
+	glBindTexture(GL_TEXTURE_2D, 0);
+
+	glDisable(GL_LIGHTING);
+	glDisable( GL_FOG );
+	glPushMatrix();
+	sgMat4 modelview, tmp;
+    ssgGetModelviewMatrix( modelview );
+	sgCopyMat4( tmp, sgEnviro.transform );
+    sgPostMultMat4( tmp, modelview );
+    ssgLoadModelviewMatrix( tmp );
+
+    Point3D start( sgEnviro.last_lon*SG_DEGREES_TO_RADIANS, sgEnviro.last_lat*SG_DEGREES_TO_RADIANS, 0.0 );
+    Point3D dest( lon*SG_DEGREES_TO_RADIANS, lat*SG_DEGREES_TO_RADIANS, 0.0 );
+    double course = 0.0, dist = 0.0;
+    calc_gc_course_dist( dest, start, &course, &dist );
+    double ax = 0.0, ay = 0.0;
+    ax = cos(course) * dist;
+    ay = sin(course) * dist;
+
+	glTranslatef( ax, ay, -sgEnviro.last_alt );
+
+	sgEnviro.radarEcho.push_back( SGWxRadarEcho ( course, 0.0, 0.0, dist, age, true, 0 ) );
+
+	for( int n = 0 ; n < nb_tree ; n++ ) {
+        if( lt_tree[n].prev < 0 )
+			continue;
+
+        float t1 = sgLerp(0.5, 1.0, lt_tree[n].pt[PY] / h);
+		t1 *= flash;
+		if( lt_tree[n].depth >= 2 ) {
+            glLineWidth(3);
+			sgScaleVec4(c, col, t1 * 0.6f);
+			DRAW_SEG();
+		} else {
+			if( lt_tree[n].depth == 0 ) {
+                glLineWidth(12);
+				sgScaleVec4(c, col, t1 * 0.5f);
+				DRAW_SEG();
+
+                glLineWidth(6);
+				sgScaleVec4(c, col, t1);
+				DRAW_SEG();
+			} else {
+                glLineWidth(6);
+				sgScaleVec4(c, col, t1 * 0.7f);
+				DRAW_SEG();
+			}
+
+            if( lt_tree[n].depth == 0 ) 
+                glLineWidth(3);
+			else
+                glLineWidth(2);
+
+            sgSetVec4(c, t1, t1, t1, t1);
+			DRAW_SEG();
+		}
+
+	}
+    glLineWidth(1);
+	glBlendFunc ( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ) ;
+	glPopMatrix();
+	glDepthMask( GL_TRUE );	
+	glEnable( GL_FOG );
+	glEnable(GL_LIGHTING);
+}
+
+void SGEnviro::addLightning(double lon, double lat, double alt) {
+	if( lightnings.size() > 10)
+		return;
+	SGLightning *lt= new SGLightning(lon, lat, alt);
+	lightnings.push_back(lt);
+}
+
+void SGEnviro::drawLightning(void) {
+	list_of_lightning::iterator iLightning;
+	// play 'thunder' for lightning
+	if( snd_active )
+		if( !snd_playing ) {
+			// wait until sound has reached us
+			snd_timer += dt;
+			if( snd_timer >= snd_wait ) {
+				snd_playing = true;
+				// compute relative position of lightning
+				Point3D start( sgEnviro.last_lon*SG_DEGREES_TO_RADIANS, sgEnviro.last_lat*SG_DEGREES_TO_RADIANS, 0.0 );
+				Point3D dest( snd_pos_lon*SG_DEGREES_TO_RADIANS, snd_pos_lat*SG_DEGREES_TO_RADIANS, 0.0 );
+				double course = 0.0, dist = 0.0;
+				calc_gc_course_dist( dest, start, &course, &dist );
+				double ax = 0.0, ay = 0.0;
+				ax = cos(course) * dist;
+				ay = sin(course) * dist;
+				SGSoundSample *snd = soundMgr->find("thunder");
+				if( snd ) {
+					ALfloat pos[3]={ax, ay, -sgEnviro.last_alt };
+					snd->set_source_pos(pos);
+					snd->play_once();
+				}
+			}
+		} else {
+			if( !soundMgr->is_playing("thunder") ) {
+				snd_active = false;
+				snd_playing = false;
+			}
+		}
+
+	if( ! lightning_enable_state )
+		return;
+
+	for( iLightning = lightnings.begin() ; iLightning != lightnings.end() ; iLightning++ ) {
+		if( dt )
+			if( sg_random() > 0.95f )
+				(*iLightning)->lt_build();
+		(*iLightning)->lt_Render();
+		(*iLightning)->age -= dt;
+		if( (*iLightning)->age < 0.0 ) {
+			delete (*iLightning);
+			lightnings.erase( iLightning );
+			break;
+		}
+	}
+
+}
+
+
+void SGEnviro::setFOV( float w, float h ) {
+	fov_width = w;
+	fov_height = h;
+}
+
+void SGEnviro::getFOV( float &w, float &h ) {
+	w = fov_width;
+	h = fov_height;
+}

simgear/environment/visual_enviro.hxx

@@ -0,0 +1,228 @@
+// Visual environment helper class
+//
+// Written by Harald JOHNSEN, started April 2005.
+//
+// Copyright (C) 2005  Harald JOHNSEN - hjohnsen@evc.net
+//
+// 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 the Free Software Foundation; either version 2 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+//
+//
+#ifndef _VISUAL_ENVIRO_HXX
+#define _VISUAL_ENVIRO_HXX
+
+#include <simgear/compiler.h>
+#include STL_STRING
+#include <vector>
+
+SG_USING_STD(vector);
+SG_USING_STD(string);
+
+class SGLightning;
+class SGSoundMgr;
+
+/**
+ * Simulate some echo on a weather radar.
+ * Container class for the wx radar instrument.
+ */
+class SGWxRadarEcho {
+public:
+	SGWxRadarEcho(float _heading, float _alt, float _radius, float _dist, double _LWC, bool _lightning, int _cloudId) :
+	  heading( _heading ),
+	  alt ( _alt ),
+	  radius ( _radius ),
+	  dist ( _dist ),
+	  LWC ( _LWC ),
+	  lightning ( _lightning ),
+	  cloudId ( _cloudId )
+	{}
+
+	/** the heading in radian is versus north */
+	float heading;
+	float alt, radius, dist;
+	/** reflectivity converted to liquid water content. */
+	double LWC;
+	/** if true then this data is for a lightning else it is for water echo. */
+	bool   lightning;
+	/** Unique identifier of cloud */
+	int cloudId;
+};
+
+typedef vector<SGWxRadarEcho> list_of_SGWxRadarEcho;
+
+/**
+ * Visual environment helper class.
+ */
+class SGEnviro {
+friend class SGLightning;
+private:
+	void DrawCone2(float baseRadius, float height, int slices, bool down, double rain_norm, double speed);
+	void lt_update(void);
+
+	bool view_in_cloud;
+	bool precipitation_enable_state;
+	float precipitation_density;
+	float precipitation_max_alt;
+	bool turbulence_enable_state;
+	double last_cloud_turbulence, cloud_turbulence;
+	bool lightning_enable_state;
+	double elapsed_time, dt;
+	sgVec4	fog_color;
+	sgMat4 transform;
+	double last_lon, last_lat, last_alt;
+	SGSoundMgr	*soundMgr;
+	bool		snd_active, snd_playing;
+	double		snd_timer, snd_wait, snd_pos_lat, snd_pos_lon, snd_dist;
+	double		min_time_before_lt;
+
+	float fov_width, fov_height;
+
+	/** a list of all the radar echo. */
+	list_of_SGWxRadarEcho radarEcho;
+
+public:
+	SGEnviro();
+	~SGEnviro();
+
+    /**
+     * Forward a few states used for renderings.
+     */
+	void startOfFrame( sgVec3 p, sgVec3 up, double lon, double lat, double alt, double delta_time);
+
+	void endOfFrame(void);
+
+    /**
+     * Whenever a cloud is drawn we check his 'impact' on the environment.
+     * @param heading direction of cloud in radians
+     * @param alt asl of cloud in meters
+     * @param radius radius of cloud in meters
+     * @param familly cloud familly
+     * @param dist  squared dist to cloud in meters
+     */
+	void callback_cloud(float heading, float alt, float radius, int familly, float dist, int cloudId);
+
+	void drawRain(double pitch, double roll, double heading, double speed, double rain_norm);
+    /**
+     * Draw rain or snow precipitation around the viewer.
+     * @param rain_norm rain normalized intensity given by metar class
+     * @param snow_norm snow normalized intensity given by metar class
+     * @param hail_norm hail normalized intensity given by metar class
+     * @param pitch pitch rotation of viewer
+     * @param roll roll rotation of viewer
+     * @param speed moving speed of viewer in kt
+     */
+	void drawPrecipitation(double rain_norm, double snow_norm, double hail_norm,
+							double pitch, double roll, double heading, double speed);
+
+    /**
+     * Draw the lightnings spawned by cumulo nimbus.
+     */
+	void drawLightning(void);
+
+    /**
+     * Forward the fog color used by the rain rendering.
+     * @param adj_fog_color color of the fog
+     */
+	void setLight(sgVec4 adj_fog_color);
+
+	// this can be queried to add some turbulence for example
+	bool is_view_in_cloud(void) const;
+	void set_view_in_cloud(bool incloud);
+	double get_cloud_turbulence(void) const;
+
+	// Clouds
+	// return the size of the memory pool used by texture impostors
+	int get_clouds_CacheSize(void) const;
+	int get_CacheResolution(void) const;
+	float get_clouds_visibility(void) const;
+	float get_clouds_density(void) const;
+	bool get_clouds_enable_state(void) const;
+	bool get_turbulence_enable_state(void) const;
+
+    /**
+     * Set the size of the impostor texture cache for 3D clouds.
+     * @param sizeKb size of the texture pool in Kb
+     */
+	void set_clouds_CacheSize(int sizeKb);
+    /**
+     * Set the resolution of the impostor texture for 3D clouds.
+     * @param resolutionPixels size of each texture in pixels (64|128|256)
+     */
+	void set_CacheResolution(int resolutionPixels);
+    /**
+     * Set the maximum range used when drawing clouds.
+	 * Clouds are blended from totaly transparent at max range to totaly opaque around the viewer
+     * @param distance in meters
+     */
+	void set_clouds_visibility(float distance);
+    /**
+     * Set the proportion of clouds that will be rendered to limit drop in FPS.
+     * @param density 0..100 no clouds drawn when density == 0, all are drawn when density == 100
+     */
+	void set_clouds_density(float density);
+    /**
+     * Enable or disable the use of 3D clouds.
+     * @param enable when false we draw the 2D layers
+     */
+	void set_clouds_enable_state(bool enable);
+    /**
+     * Enable or disable the use of proximity cloud turbulence.
+     * @param enable when true the turbulence is computed based on type of cloud around the AC
+     */
+	void set_turbulence_enable_state(bool enable);
+
+	// rain/snow
+	float get_precipitation_density(void) const;
+	bool get_precipitation_enable_state(void) const;
+
+	void set_precipitation_density(float density);
+    /**
+     * Enable or disable the rendering of precipitation around the viewer.
+     * @param enable when true we will draw precipitation depending on metar data
+     */
+	void set_precipitation_enable_state(bool enable);
+
+	// others
+	bool get_lightning_enable_state(void) const;
+    /**
+     * Enable or disable the rendering of lightning and the thunder sound.
+     * @param enable when true we will draw lightning spwaned by cumulonimbus
+     */
+	void set_lightning_enable_state(bool enable);
+
+    /**
+     * Spawn a new lighning at specified lon/lat.
+     * @param lon position of the new lightning
+     * @param lat position of the new lightning
+     * @param alt asl of the starting point of the lightning in meters
+     */
+	void addLightning(double lon, double lat, double alt);
+
+    /**
+     * Forward the sound manager instance to be able to play samples.
+     * @param mgr a running sound manager
+     */
+	void set_soundMgr(SGSoundMgr *mgr);
+
+	void setFOV( float w, float h );
+	void getFOV( float &w, float &h );
+
+	list_of_SGWxRadarEcho *get_radar_echo(void);
+
+	sgMat4 *get_transform(void) { return &transform; }
+};
+
+extern SGEnviro sgEnviro;
+
+#endif // _VISUAL_ENVIRO_HXX

simgear/ephemeris/Makefile.am

@@ -4,7 +4,7 @@ lib_LIBRARIES = libsgephem.a
 
 include_HEADERS = \
 	celestialBody.hxx \
-        ephemeris.hxx \
+	ephemeris.hxx \
 	jupiter.hxx \
 	mars.hxx \
 	mercury.hxx \

simgear/ephemeris/ephemeris.cxx

@@ -3,7 +3,7 @@
 //
 // Written by Curtis Olson, started March 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -22,6 +22,11 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
+#include <iostream>
 
 #include "ephemeris.hxx"
 
@@ -37,6 +42,10 @@ SGEphemeris::SGEphemeris( const string &path ) {
     saturn = new Saturn;
     uranus = new Uranus;
     neptune = new Neptune;
+    nplanets = 7;
+    for ( int i = 0; i < nplanets; ++i ) {
+        sgdSetVec3( planets[i], 0.0, 0.0, 0.0 );
+    }
     stars = new SGStarData( SGPath(path) );
 }
 

simgear/ephemeris/ephemeris.hxx

@@ -7,7 +7,7 @@
 // All the core code underneath this is written by Durk Talsma.  See
 // the headers of all the other individual files for details.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -48,7 +48,7 @@
 /** Ephemeris class
  *
  * Written by Durk Talsma <d.talsma@direct.a2000.nl> and Curtis Olson
- * <curt@flightgear.org>
+ * <http://www.flightgear.org/~curt>
  *
  * Introduction 
  *

simgear/ephemeris/moonpos.cxx

@@ -172,7 +172,7 @@ void MoonPos::updatePosition(double mjd, double lst, double lat, Star *ourSun)
   // SG_LOG( SG_GENERAL, SG_INFO, "rho = " << rho );
   
   if (geoRa < 0)
-    geoRa += (2*SGD_PI);
+    geoRa += SGD_2PI;
   
   HA = lst - (3.8197186 * geoRa);
   /* SG_LOG( SG_GENERAL, SG_INFO, "t->getLst() = " << t->getLst() 

simgear/ephemeris/star.cxx

@@ -80,7 +80,7 @@ void Star::updatePosition(double mjd)
   double 
     actTime, eccAnom, 
     xv, yv, v, r,
-    xe, ye, ze, ecl;
+    xe, ecl;
 
   updateOrbElements(mjd);
   

simgear/ephemeris/star.hxx

@@ -35,6 +35,7 @@ class Star : public CelestialBody
 private:
 
     double xs, ys;     // the sun's rectangular geocentric coordinates
+    double ye, ze;     // the sun's rectangularequatorial rectangular geocentric coordinates
     double distance;   // the sun's distance to the earth
 
 public:
@@ -47,6 +48,8 @@ public:
     double getw();
     double getxs();
     double getys();
+    double getye();
+    double getze();
     double getDistance();
 };
 
@@ -71,6 +74,16 @@ inline double Star::getys()
   return ys;
 }
 
+inline double Star::getye()
+{
+   return ye;
+}
+
+inline double Star::getze()
+{
+   return ze;
+}
+
 inline double Star::getDistance()
 {
   return distance;

simgear/ephemeris/stardata.cxx

@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started March 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public
@@ -21,13 +21,16 @@
 //
 // $Id$
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sgstream.hxx>
 
 #include "stardata.hxx"
 
-#if defined (_MSC_VER) || defined (SG_HAVE_NATIVE_SGI_COMPILERS)
+#if defined (_MSC_VER)
   SG_USING_STD(getline);
 #endif
 

simgear/ephemeris/stardata.hxx

@@ -2,7 +2,7 @@
 //
 // Written by Curtis Olson, started March 2000.
 //
-// Copyright (C) 2000  Curtis L. Olson - curt@flightgear.org
+// Copyright (C) 2000  Curtis L. Olson - http://www.flightgear.org/~curt
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public

simgear/interpreter/Makefile.am

@@ -1,33 +0,0 @@
-includedir = @includedir@/js
-
-lib_LIBRARIES = libsginterp.a
-
-include_HEADERS = \
-	interpreter.hxx
-
-libsginterp_a_SOURCES = \
-	interpreter.cxx interpreter.hxx \
-        ixlib_javascript.hh \
-	js_array.cc \
-	js_expression.cc \
-	js_interpreter.cc  \
-	js_value.cc \
-	js_declaration.cc \
-	js_instruction.cc  \
-	js_library.cc \
-	lex.javascript.cc ixlib_token_lex.hh ixlib_token_javascript.hh \
-	scanner.cc ixlib_scanner.hh ixlib_scanjs.hh \
-	exbase.cc \
-	numeric.cc ixlib_numeric.hh \
-	numconv.cc ixlib_numconv.hh \
-	re.cc ixlib_re.hh ixlib_re_impl.hh \
-	exgen.cc ixlib_exgen.hh \
-	string.cc ixlib_string.hh \
-	ixlib_base.hh \
-	ixlib_exbase.hh \
-	ixlib_garbage.hh \
-	ixlib_i18n.hh \
-	ixlib_js_internals.hh \
-	ixlib_random.hh
-
-INCLUDES = -I$(top_srcdir)

simgear/interpreter/exbase.cc

@@ -1,77 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : Exception handling
-// ----------------------------------------------------------------------------
-//  (c) Copyright 1996 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#include <cstdio>
-#include <cstring>
-#include <ixlib_exbase.hh>
-
-
-
-
-using namespace ixion;
-
-
-
-
-// Description forms ----------------------------------------------------------
-#define T_DESCRIPTION1          "[%s%04X] %s"
-#define T_DESCRIPTION2          "[%s%04X] %s <%s>"
-#define T_DESCRIPTION3          "[%s%04X] %s <%s,%d>"
-#define T_DESCRIPTION1I         "[%s%04X] %s (%s)"
-#define T_DESCRIPTION2I         "[%s%04X] %s (%s) <%s>"
-#define T_DESCRIPTION3I         "[%s%04X] %s (%s) <%s,%d>"
-
-
-
-
-// base_exception -------------------------------------------------------------
-char base_exception::RenderBuffer[EX_INFOMAX+1+100];
-
-
-
-
-base_exception::base_exception(TErrorCode error,char const *info,char *module,
-  TIndex line,char *category)
-: Error(error),Module(module),Line(line),Category(category) {
-  HasInfo = (info!=NULL);
-  if (info) {
-    if (strlen(info)>EX_INFOMAX) {
-      strncpy(Info,info,EX_INFOMAX);
-      Info[EX_INFOMAX] = '\0';
-      }
-    else strcpy(Info,info);
-    }
-  }
-
-
-
-
-char const *base_exception::what() const throw () {
-  if (HasInfo) {
-    if (Module) {
-      if (Line)
-	sprintf(RenderBuffer,T_DESCRIPTION3I,Category,Error,getText(),Info,Module,Line);
-      else
-	sprintf(RenderBuffer,T_DESCRIPTION2I,Category,Error,getText(),Info,Module);
-      }
-    else
-      sprintf(RenderBuffer,T_DESCRIPTION1I,Category,Error,getText(),Info);
-    }
-  else {
-    if (Module) {
-      if (Line)
-	sprintf(RenderBuffer,T_DESCRIPTION3,Category,Error,getText(),Module,Line);
-      else
-	sprintf(RenderBuffer,T_DESCRIPTION2,Category,Error,getText(),Module);
-    }
-    else
-      sprintf(RenderBuffer,T_DESCRIPTION1,Category,Error,getText());
-    }
-  return RenderBuffer;
-  }

simgear/interpreter/exgen.cc

@@ -1,46 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : Generic exceptions
-// ----------------------------------------------------------------------------
-//  (c) Copyright 1996 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#include "ixlib_i18n.hh"
-#include <ixlib_exgen.hh>
-#include <ixlib_numconv.hh>
-
-
-
-
-using namespace ixion;
-
-
-
-
-static char *(PlainText[]) = { 
-  N_("Unable to evaluate expression"),
-  N_("Function not yet implemented"),
-  N_("General error"),
-  N_("NULL pointer encountered"),
-  N_("Invalid parameter"),
-  N_("Index out of range"),
-  N_("Buffer overrun"),
-  N_("Buffer underrun"),
-  N_("Item not found"),
-  N_("Invalid operation"),
-  N_("Dimension mismatch"),
-  N_("Operation cancelled"),
-  N_("Unable to operate on empty set"),
-  N_("Unable to remove GC entry"),
-  N_("Unable to protect non-freeable entry")
-  };
-
-
-
-
-// generic_exception ----------------------------------------------------------
-char const *generic_exception::getText() const {
-  return _(PlainText[Error]);
-  }

simgear/interpreter/interpreter.cxx

@@ -1,9 +0,0 @@
-#include "interpreter.hxx"
-
-SGInterpreter::SGInterpreter ()
-{
-}
-
-SGInterpreter::~SGInterpreter ()
-{
-}

simgear/interpreter/interpreter.hxx

@@ -1,13 +0,0 @@
-#ifndef __INTERPRETER_HXX
-#define __INTERPRETER_HXX 1
-
-class SGInterpreter
-{
-public:
-
-  SGInterpreter ();
-  virtual ~SGInterpreter ();
-
-};
-
-#endif

simgear/interpreter/ixlib_base.hh

@@ -1,107 +0,0 @@
-/* ----------------------------------------------------------------------------
-    Description      : iXiONmedia library base declarations
-   ----------------------------------------------------------------------------
-    (c) Copyright 1996 by iXiONmedia, all rights reserved.
-   ----------------------------------------------------------------------------
-   This header must be C-safe for autoconf purposes.
-   */
-
-
-
-
-#ifndef IXLIB_BASE
-#define IXLIB_BASE
-
-
-#undef HAVE_CONFIG_H
-
-#ifdef HAVE_CONFIG_H
-#include <ixlib_config.hh>
-#undef PACKAGE
-#undef VERSION
-#endif
-
-
-
-
-#ifdef __cplusplus
-namespace ixion {
-  extern "C" {
-#endif
-/* Aliases --------------------------------------------------------------------
-*/
-  const double Pi = 3.141592653589793285;
-  const double Euler = 2.718281828;
-  const double Gravity = 9.8065; // m/s^2
-  const double UniGravity = 6.673e-11; // m^3/kg s^2
-  const double Epsilon0 = 8.8542e-12; // F/m
-  const double Mu0 = 1.2566e-6; // H/m
-  const double LightSpeed = 2.9972e8; // m/s
-  const double Planck = 6.6261e-34; // Js
-
-
-
-
-/* STL Helper macro -----------------------------------------------------------
-*/
-#define FOREACH(VAR,LIST,LISTTYPE) \
-  for (LISTTYPE::iterator VAR = (LIST).begin(),last = (LIST).end();VAR != last;VAR++) 
-#define FOREACH_CONST(VAR,LIST,LISTTYPE) \
-  for (LISTTYPE::const_iterator VAR = (LIST).begin(),last = (LIST).end();VAR != last;VAR++) 
-
-
-
-
-/* Nomenclature typedefs ------------------------------------------------------
-*/
-  typedef unsigned char   	TUnsigned8;
-  typedef unsigned short  	TUnsigned16;
-  typedef unsigned long   	TUnsigned32;
-  typedef unsigned long long 	TUnsigned64;
-  
-  typedef signed char   	TSigned8;
-  typedef signed short  	TSigned16;
-  typedef signed long   	TSigned32;
-  typedef signed long long 	TSigned64;
-
-  typedef TSigned8      	TDelta8;
-  typedef TSigned16     	TDelta16;
-  typedef TSigned32     	TDelta32;
-  typedef TSigned64		TDelta64;
-  typedef signed        	TDelta;
-  
-  typedef TUnsigned8      	TSize8;
-  typedef TUnsigned16     	TSize16;
-  typedef TUnsigned32     	TSize32;
-  typedef TUnsigned64		TSize64;
-  typedef unsigned        	TSize;
-  
-  typedef TUnsigned8      	TIndex8;
-  typedef TUnsigned16     	TIndex16;
-  typedef TUnsigned32     	TIndex32;
-  typedef TUnsigned64		TIndex64;
-  typedef unsigned        	TIndex;
-  
-  typedef TUnsigned8		TByte;
-  
-  
-  
-  
-  int ixlibGetMajorVersion();
-  int ixlibGetMinorVersion();
-  int ixlibGetMicroVersion();
-
-  void ixlibInitI18n();
-  
-  
-  
-  
-  #ifdef __cplusplus
-    }
-  }
-  #endif
-
-
-
-
-#endif

simgear/interpreter/ixlib_exbase.hh

@@ -1,72 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : Exception handling
-// ----------------------------------------------------------------------------
-//  (c) Copyright 1996 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#ifndef IXLIB_EXBASE
-#define IXLIB_EXBASE
-
-
-
-
-#include <stdexcept>
-#include <ixlib_base.hh>
-
-
-
-
-// constants ------------------------------------------------------------------
-#define EX_INFOMAX 255
-
-
-
-
-// throw macro ----------------------------------------------------------------
-#define EX_THROW(TYPE,CODE)\
-  throw ::ixion::TYPE##_exception(CODE,NULL,__FILE__,__LINE__);
-#define EX_THROWINFO(TYPE,CODE,INFO)\
-  throw ::ixion::TYPE##_exception(CODE,(char const *) INFO,__FILE__,__LINE__);
-#define EX_CATCHCODE(TYPE,CODE,HANDLER)\
-  catch (TYPE##_exception &ex) { \
-    if (ex.Error != CODE) throw; \
-    HANDLER \
-  }
-#define EX_CONVERT(TYPE,CODE,DESTTYPE,DESTCODE)\
-  catch (TYPE##_exception &ex) { \
-    if (ex.Error != CODE) throw; \
-    throw DESTTYPE##_exception(DESTCODE,ex.Info,__FILE__,__LINE__); \
-  }
-  
-  
-  
-  
-// xBaseException -------------------------------------------------------------
-namespace ixion {
-  typedef unsigned int TErrorCode;
-  
-  
-  
-  
-  struct base_exception : public std::exception {
-    TErrorCode          Error;
-    char                *Module;
-    TIndex             	Line;
-    char                *Category;
-    bool		HasInfo;
-    char 		Info[EX_INFOMAX+1];
-    static char		RenderBuffer[EX_INFOMAX+1+100];
-  
-    base_exception(TErrorCode error,char const *info = NULL,char *module = NULL,
-      TIndex line = 0,char *category = NULL);
-    char const *what() const throw ();
-    virtual const char *getText() const = 0;
-    };
-  }
-
-
-
-#endif

simgear/interpreter/ixlib_exgen.hh

@@ -1,67 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : Generic exceptions
-// ----------------------------------------------------------------------------
-//  (c) Copyright 1996 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#ifndef IXLIB_EXGEN
-#define IXLIB_EXGEN
-
-
-
-
-#include <ixlib_exbase.hh>
-
-
-
-
-// Error codes ----------------------------------------------------------------
-#define EC_CANNOTEVALUATE               0
-#define EC_NOTYETIMPLEMENTED            1
-#define EC_ERROR                        2
-#define EC_NULLPOINTER                  3
-#define EC_INVALIDPAR			4
-#define EC_INDEX			5
-#define EC_BUFFEROVERFLOW               6
-#define EC_BUFFERUNDERFLOW              7
-#define EC_ITEMNOTFOUND                 8
-#define EC_INVALIDOP                    9
-#define EC_DIMENSIONMISMATCH		10
-#define EC_CANCELLED			11
-#define EC_EMPTYSET			12
-#define EC_CANNOTREMOVEFROMGC		13
-#define EC_REMAININGREF			14
-
-#define ECMEM_GENERAL                   0
-
-
-
-// Throw macro ----------------------------------------------------------------
-#define EXGEN_THROW(CODE)\
-  EX_THROW(generic,CODE)
-#define EXGEN_THROWINFO(CODE,INFO)\
-  EX_THROWINFO(generic,CODE,INFO)
-#define EXGEN_NYI\
-  EXGEN_THROW(EC_NOTYETIMPLEMENTED)
-
-
-
-
-namespace ixion {
-// generic_exception ----------------------------------------------------------
-  struct generic_exception : public base_exception {
-    generic_exception(TErrorCode error,char const *info = NULL,char *module = NULL,
-      TIndex line = 0)
-      : base_exception(error,info,module,line,"GEN") { 
-      }
-    virtual char const *getText() const;
-    };
-  }
-
-
-
-
-#endif

simgear/interpreter/ixlib_garbage.hh

@@ -1,491 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : Garbage collection
-// ----------------------------------------------------------------------------
-//  (c) Copyright 2000 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#ifndef IXLIB_GARBAGE
-#define IXLIB_GARBAGE
-
-
-
-
-#include <memory>
-#include <ixlib_exgen.hh>
-#include <ixlib_base.hh>
-
-
-
-
-namespace ixion {
-  template<class T>
-  class delete_deallocator {
-    public:
-      void operator()(T const *instance) {
-        delete instance;
-	}
-    };
-  template<class T>
-  class delete_array_deallocator {
-    public:
-      void operator()(T const *instance) {
-        delete[] instance;
-	}
-    };
-
-  template<class T,class Deallocator = delete_deallocator<T> >
-  class reference_manager;
-
-  template<class T>
-  class ref_base {
-    protected:
-      T					*Instance;
-    
-    public:
-      ref_base(T *instance = NULL)
-        : Instance(instance) {
-	}
-      ref_base(ref_base const &src) 
-        : Instance(src.Instance) {
-	}
-
-      // comparison
-      bool operator==(ref_base const &op2) const {
-        return Instance == op2.Instance;
-        }
-      
-      // smart pointer nitty-gritty
-      T &operator*() const {
-        return *Instance;
-	}
-      T *operator->() const {
-        return Instance;
-	}
-      T *operator+(TIndex index) const {
-        return Instance + index;
-	}
-      T &operator[](TIndex index) const {
-        return Instance[index];
-	}
-
-      // methods
-      T *get() const {
-        return Instance;
-	}
-    };
-
-
-
-
-  template<class T,class T_Managed = T>
-  class ref;
-  template<class T,class T_Managed = T>
-  class no_free_ref;
-
-
-
-
-  template<class T_Managed>
-  class reference_manager_keeper {
-    public:
-    // *** FIXME should be private, but cannot be
-    // (partial specializations cannot be declared friends)
-      static reference_manager<T_Managed> 	Manager;
-    };
-
-
-
-
-
-  /**
-  An object that acts like a reference-counted pointer to an object.
-  The corresponding reference_manager is identified implicitly through
-  static references.
-  
-  Example:
-  <code>
-    IXLIB_GARBAGE_DECLARE_MANAGER(int)
-    
-    int main() {
-      ref<int> my_int = new int(5);
-      *my_int = 17;
-      ref<int> another_int = my_int;
-      *another_int = 12;
-      
-      *my_int == 12; // true
-      }
-    </code>
-  */
-  template<class T,class T_Managed>
-  class ref : public ref_base<T> {
-    public:
-      // we have to have an explicit copy constructor, otherwise the
-      // compiler generates one, which is *ahem* - fatal
-      ref(ref const &src)
-        : ref_base<T>(src) {
-	reference_manager_keeper<T_Managed>::Manager.addReference(Instance);
-	}
-      template<class T2>
-      ref(ref<T2,T_Managed> const &src)
-        : ref_base<T>(src.get()) {
-	reference_manager_keeper<T_Managed>::Manager.addReference(Instance);
-	}
-      template<class T2>
-      ref(no_free_ref<T2,T_Managed> const &src)
-        : ref_base<T>(src.get()) {
-	reference_manager_keeper<T_Managed>::Manager.addReference(Instance);
-	}
-      ref(T *instance = NULL)
-        : ref_base<T>(instance) {
-	reference_manager_keeper<T_Managed>::Manager.addReference(Instance);
-	}
-      ~ref() {
-        reference_manager_keeper<T_Managed>::Manager.freeReference(Instance);
-	}
-	
-      ref &operator=(ref const &src) {
-        set(src.get());
-        return *this;
-        }
-      ref &operator=(T *ptr) {
-        set(ptr);
-        return *this;
-        }
-      
-      // methods
-      void release() {
-	reference_manager_keeper<T_Managed>::Manager.freeReference(Instance);
-	Instance = NULL;
-	}
-      void set(T *instance) {
-        if (instance == Instance) return;
-	
-	reference_manager_keeper<T_Managed>::Manager.freeReference(Instance);
-	Instance = instance;
-	reference_manager_keeper<T_Managed>::Manager.addReference(Instance);
-        }
-      T *releaseFromGCArena() {
-        T *oldinst = Instance;
-	reference_manager_keeper<T_Managed>::Manager.forgetReference(Instance);
-	Instance = NULL;
-	return oldinst;
-        }
-    };
-
-
-
-
-  /**
-  An object that acts like a reference-counted pointer to an object.
-  However, the referenced object is not freed if the no_free_ref
-  is the last reference to the object to go out of scope. 
-  
-  This is useful to pass objects allocated e.g. on the stack along 
-  inside ref's, while making sure they aren't freed. 
-  (which would most probably lead to disaster)
-  
-  no_free_ref's are mostly a hack, but there are situations where you cannot
-  avoid them. But even so, you should try not to use them where possible.
-  
-  The corresponding reference_manager is identified implicitly through
-  static references.
-  */
-  template<class T,class T_Managed>
-  class no_free_ref : public ref_base<T>{
-    public:
-      // we have to have an explicit copy constructor, otherwise the
-      // compiler generates one, which is *ahem* - fatal
-      no_free_ref(no_free_ref const &src)
-        : ref_base<T>(src) {
-	reference_manager_keeper<T_Managed>::Manager.addNoFreeReference(Instance);
-	}
-      template<class T2>
-      no_free_ref(ref<T2,T_Managed> const &src)
-        : ref_base<T>(src.get()) {
-	reference_manager_keeper<T_Managed>::Manager.addNoFreeReference(Instance);
-	}
-      template<class T2>
-      no_free_ref(no_free_ref<T2,T_Managed> const &src)
-        : ref_base<T>(src.get()) {
-	reference_manager_keeper<T_Managed>::Manager.addNoFreeReference(Instance);
-	}
-      no_free_ref(T *instance = NULL)
-        : ref_base<T>(instance) {
-	reference_manager_keeper<T_Managed>::Manager.addNoFreeReference(Instance);
-	}
-      ~no_free_ref() {
-        reference_manager_keeper<T_Managed>::Manager.removeNoFreeReference(Instance);
-	}
-	
-      // assignment
-      no_free_ref &operator=(no_free_ref const &src) {
-        set(src.get());
-        return *this;
-        }
-      no_free_ref &operator=(T *ptr) {
-        set(ptr);
-        return *this;
-        }
-      
-      // methods
-      void release() {
-	reference_manager_keeper<T_Managed>::Manager.removeNoFreeReference(Instance);
-	Instance = NULL;
-	}
-      void set(T *instance) {
-        if (instance == Instance) return;
-	
-	reference_manager_keeper<T_Managed>::Manager.removeNoFreeReference(Instance);
-	Instance = instance;
-	reference_manager_keeper<T_Managed>::Manager.addNoFreeReference(Instance);
-        }
-      T *releaseFromGCArena() {
-        T *oldinst = Instance;
-	reference_manager_keeper<T_Managed>::Manager.forgetReference(Instance);
-	Instance = NULL;
-	return oldinst;
-        }
-    };
-
-
-
-
-  /**
-  An object that acts like a reference-counted pointer to an object.
-  The corresponding reference_manager is identified explicitly.
-  */
-  template<class T>
-  class dynamic_ref : public ref_base<T> {
-    protected:
-      reference_manager<T> 	&Manager;
-      
-    public:
-      dynamic_ref(dynamic_ref const &src)
-        : ref_base<T>(src),Manager(src.Manager) {
-	Manager.addReference(Instance);
-	}
-      dynamic_ref(reference_manager<T> &mgr,T *instance = NULL)
-        : ref_base<T>(instance),Manager(mgr) {
-	Manager.addReference(Instance);
-	}
-      ~dynamic_ref() {
-        Manager.freeReference(Instance);
-	}
-      
-      // assignment
-      dynamic_ref &operator=(dynamic_ref const &src) {
-        set(src.get());
-        return *this;
-        }
-      dynamic_ref &operator=(T *ptr) {
-        set(ptr);
-        return *this;
-        }
-
-      // methods
-      void release() {
-	Manager.freeReference(Instance);
-	Instance = NULL;
-	}
-      void set(T *instance) {
-        if (instance == Instance) return;
-	
-	Manager.freeReference(Instance);
-	Instance = instance;
-	Manager.addReference(Instance);
-        }
-      T *releaseFromGCArena() {
-        T *oldinst = Instance;
-	Manager.forgetReference(Instance);
-	Instance = NULL;
-	return oldinst;
-        }
-    };
-  
-  
-  
-  
-  /**
-  An object that acts like a reference-counted pointer to an object.
-  However, the referenced object is not freed if the no_free_ref
-  is the last reference to the object to go out of scope. 
-  
-  This is useful to pass objects allocated e.g. on the stack along 
-  inside ref's, while making sure they aren't freed. 
-  (which would most probably lead to disaster)
-  
-  no_free_ref's are mostly a hack, but there are situations where you cannot
-  avoid them. But even so, you should try not to use them where possible.
-  
-  The corresponding reference_manager is identified explicitly.
-  */
-  template<class T>
-  class no_free_dynamic_ref : public ref_base<T> {
-    protected:
-      reference_manager<T> 	&Manager;
-      
-    public:
-      no_free_dynamic_ref(no_free_dynamic_ref const &src)
-        : ref_base<T>(src),Manager(src.Manager) {
-	Manager.addNoFreeReference(Instance);
-	}
-      no_free_dynamic_ref(reference_manager<T> &mgr,T *instance = NULL)
-        : ref_base<T>(instance),Manager(mgr) {
-	Manager.addNoFreeReference(Instance);
-	}
-      ~no_free_dynamic_ref() {
-        Manager.removeNoFreeReference(Instance);
-	}
-      
-      // assignment
-      no_free_dynamic_ref &operator=(no_free_dynamic_ref const &src) {
-        set(src.get());
-        return *this;
-        }
-      no_free_dynamic_ref &operator=(T *ptr) {
-        set(ptr);
-        return *this;
-        }
-
-      // methods
-      void release() {
-	Manager.removeNoFreeReference(Instance);
-	Instance = NULL;
-	}
-      void set(T *instance) {
-        if (instance == Instance) return;
-	
-	Manager.removeNoFreeReference(Instance);
-	Instance = instance;
-	Manager.addNoFreeReference(Instance);
-        }
-      T *releaseFromGCArena() {
-        T *oldinst = Instance;
-	Manager.forgetReference(Instance);
-	Instance = NULL;
-	return oldinst;
-        }
-    };
-  
-  
-  
-  
-  template<class T,class Deallocator>
-  class reference_manager {
-    protected:
-    
-      struct instance_data {
-	T const		*Instance;
-        TSize 		ReferenceCount,NoFreeReferenceCount;
-	instance_data	*Next,*Previous;
-	};
-      
-      class pointer_hash {
-        public:
-	};
-
-      typedef unsigned hash_value;
-      static hash_value const HASH_MAX = 0x3ff;
-      
-      instance_data					*Instances[HASH_MAX+1];
-      Deallocator					Dealloc;
-      
-    public:
-      reference_manager(Deallocator const &dealloc = Deallocator())
-        : Dealloc(dealloc) {
-	for (hash_value hv = 0;hv <= HASH_MAX;hv++)
-	  Instances[hv] = NULL;
-	}
-    
-    // *** FIXME should be
-    // protected:
-    // but cannot because partial specializations cannot be declared friends
-      void addReference(T const *instance) {
-        if (!instance) return;
-	instance_data *data = getHashEntry(instance);
-        data->ReferenceCount++;
-        }
-      void freeReference(T const *instance) {
-        if (!instance) return;
-	instance_data *data = getHashEntry(instance);
-	if (--data->ReferenceCount == 0 && data->NoFreeReferenceCount == 0) {
-	  removeHashEntry(data);
-	  Dealloc(instance);
-	  }
-        }
-      void addNoFreeReference(T const *instance) {
-        if (!instance) return;
-	instance_data *data = getHashEntry(instance);
-        data->NoFreeReferenceCount++;
-        }
-      void removeNoFreeReference(T const *instance) {
-        if (!instance) return;
-	instance_data *data = getHashEntry(instance);
-	if (--data->NoFreeReferenceCount == 0) {
-	  if (data->ReferenceCount != 0)
-            EXGEN_THROW(EC_REMAININGREF)
-          removeHashEntry(data);
-	  }
-        }
-      void forgetReference(T const *instance) {
-        if (!instance) return;
-	instance_data *data = getHashEntry(instance);
-	if (data->ReferenceCount != 1) 
-	  EXGEN_THROW(EC_CANNOTREMOVEFROMGC)
-        removeHashEntry(data);
-        }
-	
-    private:
-      hash_value hash(T const *ptr) const {
-        unsigned u = reinterpret_cast<unsigned>(ptr);
-        return (u ^ (u >> 8) ^ (u >> 16) ^ (u >> 24)) & HASH_MAX;
-        }
-      instance_data *getHashEntry(T const *instance) {
-        instance_data *data = Instances[hash(instance)];
-	while (data) {
-	  if (data->Instance == instance) return data;
-	  data = data->Next;
-	  }
-	
-	// not found, add new at front
-        instance_data *link = Instances[hash(instance)];
-	data = new instance_data;
-	
-	data->Instance = instance;
-	data->ReferenceCount = 0;
-	data->NoFreeReferenceCount = 0;
-	data->Previous = NULL;
-	data->Next = link;
-	if (link) link->Previous = data;
-	Instances[hash(instance)] = data;
-	return data;
-        }
-      void removeHashEntry(instance_data *data) {
-        instance_data *prev = data->Previous;
-        if (prev) {
-	  prev->Next = data->Next;
-	  if (data->Next) data->Next->Previous = prev;
-	  delete data;
-	  }
-	else {
-	  Instances[hash(data->Instance)] = data->Next;
-	  if (data->Next) data->Next->Previous = NULL;
-	  delete data;
-	  }
-        }
-    };
-
-
-
-
-  #define IXLIB_GARBAGE_DECLARE_MANAGER(TYPE) \
-    ixion::reference_manager<TYPE> ixion::reference_manager_keeper<TYPE>::Manager;
-  }
-
-
-
-
-#endif

simgear/interpreter/ixlib_i18n.hh

@@ -1,23 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : ixlib internationalization wrapper 
-// ----------------------------------------------------------------------------
-//  (c) Copyright 2001 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#ifndef IXLIB_I18N
-
-
-
-
-#include <string>
-#include <libintl.h>
-#define _(String) gettext(String)
-#define N_(String) (String)
-
-
-
-
-#endif

simgear/interpreter/ixlib_javascript.hh

@@ -1,380 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : Javascript interpreter
-// ----------------------------------------------------------------------------
-//  (c) Copyright 2000 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#ifndef IXLIB_JAVASCRIPT
-#define IXLIB_JAVASCRIPT
-
-
-
-
-#include <vector>
-#if __GNUC__ < 3
-  #include <hash_map>
-#else
-  #include <ext/hash_map>
-#endif
-#include <ixlib_string.hh>
-#include <ixlib_exbase.hh>
-#include <ixlib_garbage.hh>
-#include <ixlib_scanner.hh>
-
-
-
-
-// Error codes ----------------------------------------------------------------
-#define ECJS_UNTERMINATED_COMMENT		0
-#define ECJS_CANNOT_CONVERT			1
-#define ECJS_INVALID_OPERATION			2
-#define ECJS_UNEXPECTED				3
-#define ECJS_UNEXPECTED_EOF			4
-#define ECJS_CANNOT_MODIFY_RVALUE		5
-#define ECJS_UNKNOWN_IDENTIFIER			6
-#define ECJS_UNKNOWN_OPERATOR			7
-#define ECJS_INVALID_NON_LOCAL_EXIT		8
-#define ECJS_INVALID_NUMBER_OF_ARGUMENTS	9
-#define ECJS_INVALID_TOKEN			10
-#define ECJS_CANNOT_REDECLARE			11
-#define ECJS_DOUBLE_CONSTRUCTION		12
-#define ECJS_NO_SUPERCLASS			13
-#define ECJS_DIVISION_BY_ZERO                   14
-
-
-
-
-// helpful macros -------------------------------------------------------------
-#define IXLIB_JS_ASSERT_PARAMETERS(NAME,ARGMIN,ARGMAX) \
-  if (parameters.size() < ARGMIN || parameters.size() > ARGMAX) \
-    EXJS_THROWINFO(ECJS_INVALID_NUMBER_OF_ARGUMENTS,NAME)
-
-#define IXLIB_JS_IF_METHOD(NAME,ARGMIN,ARGMAX) \
-  if (identifier == NAME) \
-    if (parameters.size() < ARGMIN || parameters.size() > ARGMAX) \
-      EXJS_THROWINFO(ECJS_INVALID_NUMBER_OF_ARGUMENTS,NAME) \
-    else
-
-#define IXLIB_JS_DECLARE_FUNCTION(NAME) \
-  namespace { \
-    class NAME : public value { \
-      public: \
-        value_type getType() const { \
-          return VT_FUNCTION; \
-          } \
-        ixion::ref<ixion::javascript::value> call(parameter_list const &parameters); \
-      }; \
-    } \
-  ixion::ref<ixion::javascript::value> NAME::call(parameter_list const &parameters)
-
-#define IXLIB_JS_CONVERT_PARAMETERS_0 \
-  
-  
-
-
-// Exception throw macros -----------------------------------------------------
-#define EXJS_THROW(CODE)\
-  EX_THROW(javascript,CODE)
-#define EXJS_THROWINFO(CODE,INFO)\
-  EX_THROWINFO(javascript,CODE,INFO)
-#define EXJS_THROW_NO_LOCATION(CODE)\
-  EX_THROW(no_location_javascript,CODE)
-#define EXJS_THROWINFO_NO_LOCATION(CODE,INFO)\
-  EX_THROWINFO(no_location_javascript,CODE,INFO)
-#define EXJS_THROWINFOLOCATION(CODE,INFO,LOCATION)\
-  throw ixion::javascript_exception(CODE,LOCATION,INFO,__FILE__,__LINE__);
-#define EXJS_THROWINFOTOKEN(CODE,INFO,TOKEN)\
-  EXJS_THROWINFOLOCATION(CODE,INFO,code_location(TOKEN))
-#define EXJS_THROWINFOEXPRESSION(CODE,INFO,EXPR)\
-  EXJS_THROWINFOLOCATION(CODE,INFO,(EXPR).getCodeLocation())
-
-
-
-
-
-namespace ixion {
-  namespace javascript {
-    struct code_location;
-    }
-  
-  // exceptions ---------------------------------------------------------------
-  struct no_location_javascript_exception : public base_exception {
-    no_location_javascript_exception(TErrorCode error,char const *info = NULL,char *module = NULL,
-      TIndex line = 0)
-      : base_exception(error,info,module,line,"JS") {
-      }
-    virtual char *getText() const;
-    };
-
-
-
-
-  struct javascript_exception : public base_exception {
-    javascript_exception(TErrorCode error,char const *info = NULL,char *module = NULL,
-      TIndex line = 0)
-      : base_exception(error,info,module,line,"JS") {
-      }
-    javascript_exception(TErrorCode error,javascript::code_location const &loc,char const *info = 0,char *module = NULL,
-      TIndex line = 0);
-    javascript_exception(no_location_javascript_exception const &half_ex,javascript::code_location const &loc);
-    virtual char *getText() const;
-    };
-
-
-
-
-  // javascript ---------------------------------------------------------------
-  /**
-  This code tries to be an implementation of ECMAScript 4, as available at 
-  http://www.mozilla.org/js/language/
-  Note that ES4 is still in the process of standardization. 
-
-  It is meant to behave like an ES4 interpreter in strict mode, none
-  of the backward-compatible braindead-isms like newline semicolon
-  insertion and other stuff will ever be implemented.
-
-  This is the list of its shortcomings:
-  <ul>
-    <li> exceptions
-    <li> namespaces,packages
-    <li> constness
-    <li> Number/String constructor and class methods
-    <li> real regexp's
-    <li> the methods listed in FIXME's (js_library.cc js_value.cc)
-    <li> cannot cross-assign predefined methods [won't be]
-    <li> Grammatical semicolon insertion [won't be]
-    <li> type declaration [won't be]
-    </ul>
-
-  Be advised that a javascript value that is passed to you through the
-  interpreter, e.g. as a call parameter, may not be of the type that
-  you expect. For example, in "var x = 4; f(x);", what comes in as
-  the parameter x into f is a wrapper value that adds assign()ability
-  to a value that is wrapped inside. The advised solution to get the
-  object that you expect is to call eliminateWrappers() on the potentially
-  wrapped value.
-  */
-  namespace javascript {
-    class value;
-    class list_scope;
-    struct context {
-      ref<list_scope,value>     DeclarationScope;
-      ref<value>                LookupScope;
-      
-      context(ref<list_scope,value> scope);
-      context(ref<value> scope);
-      context(ref<list_scope,value> decl_scope,ref<value> lookup_scope);
-      };
-
-    class expression;
-    
-    class value {
-      public:
-        enum operator_id { 
-          // unary, modifying
-          OP_PRE_INCREMENT,OP_POST_INCREMENT,
-          OP_PRE_DECREMENT,OP_POST_DECREMENT,
-          // unary, non-modifying
-          OP_UNARY_PLUS,OP_UNARY_MINUS,
-          OP_LOG_NOT,OP_BIN_NOT,
-          // binary, modifying
-          OP_PLUS_ASSIGN,OP_MINUS_ASSIGN,
-          OP_MUTLIPLY_ASSIGN,OP_DIVIDE_ASSIGN,OP_MODULO_ASSIGN,
-          OP_BIT_AND_ASSIGN,OP_BIT_OR_ASSIGN,OP_BIT_XOR_ASSIGN,
-          OP_LEFT_SHIFT_ASSIGN,OP_RIGHT_SHIFT_ASSIGN,
-          // binary, non-modifying
-          OP_PLUS,OP_MINUS,
-          OP_MULTIPLY,OP_DIVIDE,OP_MODULO,
-          OP_BIT_AND,OP_BIT_OR,OP_BIT_XOR,
-          OP_LEFT_SHIFT,OP_RIGHT_SHIFT,
-          OP_LOGICAL_OR,OP_LOGICAL_AND,
-          OP_EQUAL,OP_NOT_EQUAL,OP_IDENTICAL,OP_NOT_IDENTICAL,
-          OP_LESS_EQUAL,OP_GREATER_EQUAL,OP_LESS,OP_GREATER,
-          // special
-          OP_ASSIGN,
-          };
-        
-        enum value_type {
-          VT_UNDEFINED,VT_NULL,
-          VT_INTEGER,VT_FLOATING_POINT,VT_STRING,
-          VT_FUNCTION,VT_OBJECT,VT_BUILTIN,VT_HOST,
-	  VT_SCOPE,VT_BOUND_METHOD,VT_TYPE
-          };
-        typedef std::vector<ref<value> >	parameter_list;
-
-        virtual ~value() {
-          }
-      
-        virtual value_type getType() const = 0;
-        virtual std::string toString() const;
-        virtual int toInt() const;
-        virtual double toFloat() const;
-        virtual bool toBoolean() const;
-	// toString is meant as a type conversion, whereas stringify
-	// is for debuggers and the like
-	virtual std::string stringify() const;
-        
-        virtual ref<value> eliminateWrappers();
-        virtual ref<value> duplicate();
-
-        virtual ref<value> lookup(std::string const &identifier);
-        virtual ref<value> subscript(value const &index);
-        virtual ref<value> call(parameter_list const &parameters);
-        virtual ref<value> callAsMethod(ref<value> instance,parameter_list const &parameters);
-        virtual ref<value> construct(parameter_list const &parameters);
-        virtual ref<value> assign(ref<value> op2);
-        
-        virtual ref<value> operatorUnary(operator_id op) const;
-        virtual ref<value> operatorBinary(operator_id op,ref<value> op2) const;
-        virtual ref<value> operatorBinaryShortcut(operator_id op,expression const &op2,context const &ctx) const;
-        virtual ref<value> operatorUnaryModifying(operator_id op);
-        virtual ref<value> operatorBinaryModifying(operator_id op,ref<value> op2);
-        
-        static operator_id token2operator(scanner::token const &token,bool unary = false,bool prefix = false);
-        static std::string operator2string(operator_id op);
-	static std::string valueType2string(value_type vt);
-      };
-    
-    // obviously, any value can have methods, but with this neat little
-    // interface implementing methods has just become easier.
-    class value_with_methods : public value {
-        class bound_method : public value {
-            std::string				Identifier;
-            ref<value_with_methods,value>	Parent;
-            
-          public:
-            bound_method(std::string const &identifier,ref<value_with_methods,value> parent);
-
-            value_type getType() const {
-              return VT_BOUND_METHOD;
-              }
-
-            ref<value> duplicate();
-            ref<value> call(parameter_list const &parameters);
-          };
-            
-      public:
-        ref<value> lookup(std::string const &identifier);
-        virtual ref<value> callMethod(std::string const &identifier,parameter_list const &parameters) = 0;
-      };
-
-    // obviously, any value can already represent a scope ("lookup" member!).
-    // the list_scope class is an explicit scope that can "swallow" 
-    // (=unite with) other scopes and keeps a list of registered members
-    class list_scope : public value {
-      protected:
-        typedef std::hash_map<std::string,ref<value>,string_hash> member_map;
-        typedef std::vector<ref<value> >			swallowed_list;
-        
-        member_map	MemberMap;
-        swallowed_list	SwallowedList;
-        
-      public:
-        value_type getType() const {
-	  return VT_SCOPE;
-	  }
-
-        ref<value> lookup(std::string const &identifier);
-
-        void unite(ref<value> scope);
-        void separate(ref<value> scope);
-	void clearScopes();
-        
-        bool hasMember(std::string const &name) const;
-	void addMember(std::string const &name,ref<value> member);
-        void removeMember(std::string const &name);
-	void clearMembers();
-	
-	void clear();
-      };
-    
-    class js_array : public value_with_methods {
-      private:
-        typedef value_with_methods		super;
-        
-      protected:
-        typedef std::vector<ref<value> >	value_array;
-        value_array				Array;
-  
-      public:
-        js_array() {
-          }
-        js_array(TSize size);
-        js_array(value_array::const_iterator first,value_array::const_iterator last)
-          : Array(first,last) {
-          }
-        js_array(js_array const &src)
-          : Array(src.Array) {
-          }
-        
-        value_type getType() const {
-          return VT_BUILTIN;
-          }
-
-	std::string stringify() const;
-        
-        ref<value> duplicate();
-  
-        ref<value> lookup(std::string const &identifier);
-        ref<value> subscript(value const &index);
-        ref<value> callMethod(std::string const &identifier,parameter_list const &parameters);
-  
-        TSize size() const {
-	  return Array.size();
-	  }
-	void resize(TSize size);
-	ref<value> &operator[](TIndex idx);
-        void push_back(ref<value> val);
-      };
-
-    class expression;
-    
-    ref<value> makeUndefined();
-    ref<value> makeNull();
-    ref<value> makeValue(signed long val);
-    ref<value> makeConstant(signed long val);
-    ref<value> makeValue(signed int val);
-    ref<value> makeConstant(signed int val);
-    ref<value> makeValue(unsigned long val);
-    ref<value> makeConstant(unsigned long val);
-    ref<value> makeValue(unsigned int val);
-    ref<value> makeConstant(unsigned int val);
-    ref<value> makeValue(double val);
-    ref<value> makeConstant(double val);
-    ref<value> makeValue(std::string const &val);
-    ref<value> makeConstant(std::string const &val);
-    ref<value> makeArray(TSize size = 0);
-    ref<value> makeLValue(ref<value> target);
-    ref<value> wrapConstant(ref<value> val);
-
-    class interpreter {
-      public:
-        ref<list_scope,value>			RootScope;
-      
-      public:
-        interpreter();
-	~interpreter();
-        
-        ref<expression> parse(std::string const &str);
-        ref<expression> parse(std::istream &istr);
-        ref<value> execute(std::string const &str);
-        ref<value> execute(std::istream &istr);
-        ref<value> execute(ref<expression> expr);
-    
-      private:
-        ref<value> evaluateCatchExits(ref<expression> expr);
-      };
-
-    void addGlobal(interpreter &ip);
-    void addMath(interpreter &ip);
-    void addStandardLibrary(interpreter &ip);
-    }
-  }
-
-
-
-
-#endif

simgear/interpreter/ixlib_js_internals.hh

@@ -1,760 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : Javascript interpreter
-// ----------------------------------------------------------------------------
-//  (c) Copyright 2000 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#ifndef IXLIB_JS_INTERNALS
-#define IXLIB_JS_INTERNALS
-
-
-
-
-#include <ixlib_javascript.hh>
-
-
-
-
-using namespace std;
-
-
-
-
-namespace ixion {
-  namespace javascript {
-    struct code_location {
-      TIndex	Line;
-      
-      code_location(scanner::token &tok);
-      explicit code_location(TIndex line);
-      string stringify() const;
-      };
-
-    struct return_exception {
-      ref<value>        ReturnValue;
-      code_location	Location;
-      
-      return_exception(ref<value> retval,code_location const &loc)
-        : ReturnValue(retval),Location(loc) {
-	}
-      };
-
-    struct break_exception {
-      bool              HasLabel;
-      string            Label;
-      code_location	Location;
-      
-      break_exception(bool has_label,string const &label,code_location const &loc)
-        : HasLabel(has_label),Label(label),Location(loc) {
-	}
-      };
-    
-    struct continue_exception {
-      bool              HasLabel;
-      string            Label;
-      code_location	Location;
-
-      continue_exception(bool has_label,string const &label,code_location const &loc)
-        : HasLabel(has_label),Label(label),Location(loc) {
-	}
-      };
-
-    // values -----------------------------------------------------------------
-    class null : public value {
-      private:
-        typedef value super;
-        
-      public:
-        value_type getType() const;
-        bool toBoolean() const;
-        
-        ref<value> duplicate();
-      };
-    
-    class const_floating_point : public value_with_methods {
-      private:
-        typedef value_with_methods      super;
-
-      protected:
-        double                          Value;
-      
-      public:
-        const_floating_point(double value);
-    
-        value_type getType() const;
-        int toInt() const;
-        double toFloat() const;
-        bool toBoolean() const;
-        string toString() const;
-        
-        ref<value> duplicate();
-        
-        ref<value> callMethod(string const &identifier,parameter_list const &parameters);
-        
-        ref<value> operatorUnary(operator_id op) const;
-        ref<value> operatorBinary(operator_id op,ref<value> op2) const;
-      };
-
-    class floating_point : public const_floating_point {
-      private:
-        typedef const_floating_point    super;
-        
-      public:
-        floating_point(double value);
-
-        ref<value> operatorUnaryModifying(operator_id op);
-        ref<value> operatorBinaryModifying(operator_id op,ref<value> op2);
-      };
-      
-    class const_integer : public value_with_methods {
-      private:
-        typedef value_with_methods      super;
-
-      protected:
-        long                            Value;
-      
-      public:
-        const_integer(long value);
-    
-        value_type getType() const;
-        int toInt() const;
-        double toFloat() const;
-        bool toBoolean() const;
-        string toString() const;
-        
-        ref<value> duplicate();
-        
-        ref<value> callMethod(string const &identifier,parameter_list const &parameters);
-        
-        ref<value> operatorUnary(operator_id op) const;
-        ref<value> operatorBinary(operator_id op,ref<value> op2) const;
-      };
-
-    class integer : public const_integer {
-      private:
-        typedef const_integer   super;
-        
-      public:
-        integer(long value);
-
-        ref<value> operatorUnaryModifying(operator_id op);
-        ref<value> operatorBinaryModifying(operator_id op,ref<value> op2);
-      };
-      
-    class js_string : public value_with_methods {
-      private:
-        typedef value_with_methods      super;
-        
-      protected:
-        string                          Value;
-      
-      public:
-        js_string(string const &value);
-    
-        value_type getType() const;
-        string toString() const;
-        bool toBoolean() const;
-        string stringify() const;
-
-        ref<value> duplicate();
-        
-        ref<value> lookup(string const &identifier);
-        ref<value> callMethod(string const &identifier,parameter_list const &parameters);
-
-        ref<value> operatorBinary(operator_id op,ref<value> op2) const;
-        ref<value> operatorBinaryModifying(operator_id op,ref<value> op2);
-      };
-      
-    class lvalue : public value {
-      protected:
-        ref<value>      Reference;
-      
-      public:
-        lvalue(ref<value> ref);
-        
-        value_type getType() const;
-        string toString() const;
-        int toInt() const;
-        double toFloat() const;
-        bool toBoolean() const;
-        string stringify() const;
-
-        ref<value> eliminateWrappers();
-        ref<value> duplicate();
-        
-        ref<value> lookup(string const &identifier);
-        ref<value> subscript(value const &index);
-        ref<value> call(parameter_list const &parameters);
-        ref<value> callAsMethod(ref<value> instance,parameter_list const &parameters);
-        ref<value> construct(parameter_list const &parameters);
-        ref<value> assign(ref<value> op2);
-
-        ref<value> operatorUnary(operator_id op) const;
-        ref<value> operatorBinary(operator_id op,ref<value> op2) const;
-        ref<value> operatorBinaryShortcut(operator_id op,expression const &op2,context const &ctx) const;
-        ref<value> operatorUnaryModifying(operator_id op);
-        ref<value> operatorBinaryModifying(operator_id op,ref<value> op2);
-      };
-
-    class constant_wrapper : public value {
-      protected:
-        ref<value>      Constant;
-
-      public:
-        constant_wrapper(ref<value> val);
-        
-        value_type getType() const;
-        string toString() const;
-        int toInt() const;
-        double toFloat() const;
-        bool toBoolean() const;
-        string stringify() const;
-
-        ref<value> eliminateWrappers();
-        ref<value> duplicate();
-        
-        ref<value> lookup(string const &identifier);
-        ref<value> subscript(value const &index);
-        ref<value> call(parameter_list const &parameters) const;
-        ref<value> callAsMethod(ref<value> instance,parameter_list const &parameters);
-        ref<value> construct(parameter_list const &parameters);
-        ref<value> assign(ref<value> value);
-
-        ref<value> operatorUnary(operator_id op) const;
-        ref<value> operatorBinary(operator_id op,ref<value> op2) const;
-        ref<value> operatorBinaryShortcut(operator_id op,expression const &op2,context const &ctx) const;
-        ref<value> operatorUnaryModifying(operator_id op);
-        ref<value> operatorBinaryModifying(operator_id op,ref<value> op2);
-      };
-
-    class callable_with_parameters : public value {
-      public:
-        typedef vector<string>          parameter_name_list;
-        
-      protected:
-        parameter_name_list             ParameterNameList;
-      
-      public:
-        callable_with_parameters(parameter_name_list const &pnames);
-        
-        void addParametersTo(list_scope &scope,parameter_list const &parameters) const;
-        static ref<value> evaluateBody(expression &body,context const &ctx);
-      };
-    
-    class function : public callable_with_parameters {
-        typedef callable_with_parameters 	super;
-        ref<expression>                 	Body;
-        ref<value>                      	LexicalScope;
-      
-      public:
-        function(parameter_name_list const &pnames,ref<expression> body,ref<value> lex_scope);
-
-        value_type getType() const{
-          return VT_FUNCTION;
-          }
-        
-        ref<value> duplicate();
-        
-        ref<value> call(parameter_list const &parameters);
-      };
-
-    class method : public callable_with_parameters {
-        typedef callable_with_parameters 	super;
-        ref<expression>                 	Body;
-        ref<value>                      	LexicalScope;
-      
-      public:
-        method(parameter_name_list const &pnames,ref<expression> body,ref<value> lex_scope);
-
-        value_type getType() const{
-          return VT_FUNCTION;
-          }
-        
-        ref<value> duplicate();
-        
-        ref<value> callAsMethod(ref<value> instance,parameter_list const &parameters);
-      };
-
-    class constructor : public callable_with_parameters {
-        typedef callable_with_parameters        super;
-        ref<expression>                         Body;
-        ref<value>                      	LexicalScope;
-      
-      public:
-        constructor(parameter_name_list const &pnames,ref<expression> body,ref<value> lex_scope);
-
-        value_type getType() const{
-          return VT_FUNCTION;
-          }
-        
-        ref<value> duplicate();
-        ref<value> callAsMethod(ref<value> instance,parameter_list const &parameters);
-      };
-
-    class js_class : public value {
-        class super_instance_during_construction : public value {
-          // this object constructs the superclass 
-          // a) if it is called, by calling the super constructor
-          //    with the aprropriate parameters
-          // b) implicitly with no super constructor arguments, 
-          //    if the super object is referenced explicitly
-          
-            ref<value>                  SuperClass;
-            ref<value>                  SuperClassInstance;
-
-          public:
-            super_instance_during_construction(ref<value> super_class);
-
-            value_type getType() const {
-              return VT_OBJECT;
-              }
-            
-            ref<value> call(parameter_list const &parameters);
-            ref<value> lookup(string const &identifier);
-            
-            ref<value> getSuperClassInstance();
-          };
-
-        typedef vector<ref<expression> > declaration_list;
-    
-        ref<value>                      LexicalScope;
-        ref<value>                      SuperClass;
-        ref<value>                      Constructor;
-        ref<value>                      StaticMethodScope;
-        ref<value>                      MethodScope;
-        ref<value>                      StaticVariableScope;
-        declaration_list                VariableList;
-        
-      public:
-        js_class(ref<value> lex_scope,ref<value> super_class,ref<value> constructor,
-          ref<value> static_method_scope,ref<value> method_scope,
-          ref<value> static_variable_scope,declaration_list const &variable_list);
-      
-        value_type getType() const {
-          return VT_TYPE;
-          }
-        
-        ref<value> duplicate();
-        ref<value> lookup(string const &identifier);
-        ref<value> lookupLocal(string const &identifier);
-        ref<value> construct(parameter_list const &parameters);
-      };
-    
-    class js_class_instance : public value {
-        class bound_method : public value {
-            ref<value>                  Instance;
-            ref<value>                  Method;
-            
-          public:
-            bound_method(ref<value> instance,ref<value> method);
-
-            value_type getType() const {
-              return VT_BOUND_METHOD;
-              }
-
-            ref<value> call(parameter_list const &parameters);
-          };
-
-        ref<value>                      SuperClassInstance;
-        ref<js_class,value>             Class;
-        ref<value>                      MethodScope;
-        ref<value>                      VariableScope;
-        
-      public:
-        js_class_instance(ref<js_class,value> cls,ref<value> method_scope,
-          ref<value> variable_scope);
-          
-        void setSuperClassInstance(ref<value> super_class_instance);
-        
-        value_type getType() const {
-          return VT_OBJECT;
-          }
-          
-        ref<value> duplicate();
-        ref<value> lookup(string const &identifier);
-      };
-    
-    class js_array_constructor : public value {
-      public:
-        value_type getType() const {
-          return VT_TYPE;
-          }
-        
-        ref<value> duplicate();
-        ref<value> construct(parameter_list const &parameters);
-      };
-
-    // expressions ----------------------------------------------------------
-    class expression {
-        code_location		Location;
-	
-      public:
-        expression(code_location const &loc);
-        virtual ~expression();
-        virtual ref<value> evaluate(context const &ctx) const = 0;
-	
-	code_location const &getCodeLocation() const {
-	  return Location;
-	  }
-      };
-
-    class constant : public expression {
-        ref<value>              Value;
-      public:
-        constant(ref<value> val,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-    
-    class unary_operator : public expression {
-        value::operator_id      Operator;
-        ref<expression>         Operand;
-      
-      public:
-        unary_operator(value::operator_id opt,ref<expression> opn,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-
-    class modifying_unary_operator : public expression {
-        value::operator_id      Operator;
-        ref<expression>         Operand;
-      
-      public:
-        modifying_unary_operator(value::operator_id opt,ref<expression> opn,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-      
-    class binary_operator : public expression {
-        value::operator_id      Operator;
-        ref<expression>         Operand1;
-        ref<expression>         Operand2;
-      
-      public:
-        binary_operator(value::operator_id opt,ref<expression> opn1,ref<expression> opn2,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-
-    class binary_shortcut_operator : public expression {
-        value::operator_id      Operator;
-        ref<expression>         Operand1;
-        ref<expression>         Operand2;
-      
-      public:
-        binary_shortcut_operator(value::operator_id opt,ref<expression> opn1,ref<expression> opn2,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-
-    class modifying_binary_operator : public expression {
-        value::operator_id      Operator;
-        ref<expression>         Operand1;
-        ref<expression>         Operand2;
-      
-      public:
-        modifying_binary_operator(value::operator_id opt,ref<expression> opn1,ref<expression> opn2,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-    
-    class ternary_operator : public expression {
-        ref<expression>         Operand1;
-        ref<expression>         Operand2;
-        ref<expression>         Operand3;
-      
-      public:
-        ternary_operator(ref<expression> opn1,ref<expression> opn2,ref<expression> opn3,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-    
-    class subscript_operation : public expression {
-        ref<expression>         Operand1;
-        ref<expression>         Operand2;
-      
-      public:
-        subscript_operation(ref<expression> opn1,ref<expression> opn2,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-
-    class lookup_operation : public expression {
-        ref<expression>         Operand;
-        string                  Identifier;
-      
-      public:
-        lookup_operation(string const &id,code_location const &loc);
-        lookup_operation(ref<expression> opn,string const &id,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-    
-    class assignment : public expression {
-        ref<expression>         Operand1;
-        ref<expression>         Operand2;
-      
-      public:
-        assignment(ref<expression> opn1,ref<expression> opn2,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-    
-    class basic_call : public expression {
-      public:
-        typedef vector<ref<expression> >        parameter_expression_list;
-        typedef vector<ref<value> >             parameter_value_list;
-      
-      private:
-        parameter_expression_list               ParameterExpressionList;
-      
-      public:
-        basic_call(parameter_expression_list const &pexps,code_location const &loc);
-        void makeParameterValueList(context const &ctx,parameter_value_list &pvalues) const;
-      };
-    
-    class function_call : public basic_call {
-        typedef basic_call              super;
-        ref<expression>                 Function;
-      
-      public:
-        function_call(ref<expression> fun,parameter_expression_list const &pexps,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-
-    class construction : public basic_call {
-        typedef basic_call              super;
-        ref<expression>                 Class;
-      
-      public:
-        construction(ref<expression> cls,parameter_expression_list const &pexps,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-
-    // declarations -----------------------------------------------------------
-    class variable_declaration : public expression {
-      protected:
-        string          Identifier;
-        ref<expression> DefaultValue;
-      
-      public:
-        variable_declaration(string const &id,ref<expression> def_value,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-
-    class constant_declaration : public expression {
-      protected:
-        string          Identifier;
-        ref<expression> DefaultValue;
-      
-      public:
-        constant_declaration(string const &id,ref<expression> def_value,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-
-    class function_declaration : public expression {
-      public:
-        typedef function::parameter_name_list   parameter_name_list;
-
-      private:
-        string                  Identifier;
-        parameter_name_list     ParameterNameList;
-        ref<expression>         Body;
-      
-      public:
-        function_declaration(string const &id,parameter_name_list const &pnames,
-          ref<expression> body,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-
-    class method_declaration : public expression {
-      public:
-        typedef method::parameter_name_list     parameter_name_list;
-
-      private:
-        string                  Identifier;
-        parameter_name_list     ParameterNameList;
-        ref<expression>         Body;
-      
-      public:
-        method_declaration(string const &id,parameter_name_list const &pnames,
-          ref<expression> body,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-
-    class constructor_declaration : public expression {
-      public:
-        typedef method::parameter_name_list     parameter_name_list;
-
-      private:
-        parameter_name_list     ParameterNameList;
-        ref<expression>         Body;
-      
-      public:
-        constructor_declaration(parameter_name_list const &pnames,
-          ref<expression> body,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-
-    class js_class_declaration : public expression {
-        typedef vector<ref<expression> >        declaration_list;
-
-        string                                  Identifier;
-        ref<expression>                         SuperClass;
-        ref<expression>                         ConstructorDeclaration;
-        declaration_list                        StaticMethodList;
-        declaration_list                        MethodList;
-        declaration_list                        StaticVariableList;
-        declaration_list                        VariableList;
-
-      public:
-        js_class_declaration(string const &id,ref<expression> superclass,
-	  code_location const &loc);
-        
-        ref<value> evaluate(context const &ctx) const;
-        
-        void setConstructor(ref<expression> decl);
-        void addStaticMethod(ref<expression> decl);
-        void addMethod(ref<expression> decl);
-        void addStaticVariable(ref<expression> decl);
-        void addVariable(ref<expression> decl);
-      };
-    
-    // instructions ---------------------------------------------------------
-    class instruction_list : public expression {
-        typedef vector<ref<expression> >        expression_list;
-        expression_list                         ExpressionList;
-      
-      public:
-        instruction_list(code_location const &loc)
-	  : expression(loc) {
-	  }
-        ref<value> evaluate(context const &ctx) const;
-        void add(ref<expression> expr);
-      };
-    
-    class scoped_instruction_list : public instruction_list {
-      public:
-        scoped_instruction_list(code_location const &loc)
-	  : instruction_list(loc) {
-	  }
-        ref<value> evaluate(context const &ctx) const;
-      };
-    
-    class js_if : public expression {
-        ref<expression>         Conditional;
-        ref<expression>         IfExpression;
-        ref<expression>         IfNotExpression;
-      
-      public:
-        js_if(ref<expression> cond,ref<expression> ifex,ref<expression> ifnotex,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-
-    class js_while : public expression {
-        ref<expression>         Conditional;
-        ref<expression>         LoopExpression;
-        bool                    HasLabel;
-        string                  Label;
-      
-      public:
-        js_while(ref<expression> cond,ref<expression> loopex,code_location const &loc);
-        js_while(ref<expression> cond,ref<expression> loopex,string const &Label,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-
-    class js_do_while : public expression {
-        ref<expression>         Conditional;
-        ref<expression>         LoopExpression;
-        bool                    HasLabel;
-        string                  Label;
-      
-      public:
-        js_do_while(ref<expression> cond,ref<expression> loopex,code_location const &loc);
-        js_do_while(ref<expression> cond,ref<expression> loopex,string const &Label,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-
-    class js_for : public expression {
-        ref<expression>         Initialization;
-        ref<expression>         Conditional;
-        ref<expression>         Update;
-        ref<expression>         LoopExpression;
-        bool                    HasLabel;
-        string                  Label;
-      
-      public:
-        js_for(ref<expression> init,ref<expression> cond,ref<expression> update,ref<expression> loop,code_location const &loc);
-        js_for(ref<expression> init,ref<expression> cond,ref<expression> update,ref<expression> loop,string const &label,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-    
-    class js_for_in : public expression {
-        ref<expression>         Iterator;
-        ref<expression>         Array;
-        ref<expression>         LoopExpression;
-        bool                    HasLabel;
-        string                  Label;
-      
-      public:
-        js_for_in(ref<expression> iter,ref<expression> array,ref<expression> loop,code_location const &loc);
-        js_for_in(ref<expression> iter,ref<expression> array,ref<expression> loop,string const &label,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-    
-    class js_return : public expression {
-        ref<expression>         ReturnValue;
-      
-      public:
-        js_return(ref<expression> retval,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-
-    class js_break : public expression {
-        bool                    HasLabel;
-        string                  Label;
-      
-      public:
-        js_break(code_location const &loc);
-        js_break(string const &label,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-
-    class js_continue : public expression {
-        bool                    HasLabel;
-        string                  Label;
-      
-      public:
-        js_continue(code_location const &loc);
-        js_continue(string const &label,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-    
-    class break_label : public expression {
-        string                  Label;
-        ref<expression>         Expression;
-      
-      public:
-        break_label(string const &label,ref<expression> expr,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-      };
-
-    class js_switch : public expression {
-        bool                    HasLabel;
-        string                  Label;
-        ref<expression>         Discriminant;
-        
-        struct case_label {
-          ref<expression>               DiscriminantValue;
-          ref<expression>               Expression;
-          };
-        typedef vector<case_label>      case_list;
-        case_list                       CaseList;
-      
-      public:
-        js_switch(ref<expression> discriminant,code_location const &loc);
-        js_switch(ref<expression> discriminant,string const &label,code_location const &loc);
-        ref<value> evaluate(context const &ctx) const;
-        void addCase(ref<expression> dvalue,ref<expression> expr);
-      };
-    }
-  }
-
-
-
-
-#endif

simgear/interpreter/ixlib_numconv.hh

@@ -1,62 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : Numeric conversions
-// ----------------------------------------------------------------------------
-//  (c) Copyright 1999 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#ifndef IXLIB_NUMCONV
-#define IXLIB_NUMCONV
-
-
-
-
-#include <ixlib_base.hh>
-#include <ixlib_string.hh>
-
-
-
-
-// Macros ---------------------------------------------------------------------
-#define IXLIB_NUMCHARS 		"0123456789ABCDEF"
-
-
-
-
-// Functions ------------------------------------------------------------------
-namespace ixion {
-  std::string float2dec(double value);
-  std::string float2dec(double value,unsigned int precision);
-  std::string unsigned2base(unsigned long value,char digits = 0,char radix = 10);
-  inline std::string unsigned2dec(unsigned long value,char digits = 0)
-    { return unsigned2base(value,digits,10); }
-  inline std::string unsigned2hex(unsigned long value,char digits = 0)
-    { return unsigned2base(value,digits,16); }
-  inline std::string unsigned2bin(unsigned long value,char digits = 0)
-    { return unsigned2base(value,digits,2); }
-  inline std::string unsigned2oct(unsigned long value,char digits = 0)
-    { return unsigned2base(value,digits,8); }
-  std::string signed2base(signed long value,char digits = 0,char radix = 10);
-  inline std::string signed2dec(signed long value,char digits = 0)
-    { return signed2base(value,digits,10); }
-  inline std::string signed2hex(signed long value,char digits = 0)
-    { return signed2base(value,digits,16); }
-  inline std::string signed2bin(signed long value,char digits = 0)
-    { return signed2base(value,digits,2); }
-  inline std::string signed2oct(signed long value,char digits = 0)
-    { return signed2base(value,digits,8); }
-  
-  std::string bytes2dec(TSize bytes);
-  
-  unsigned long evalNumeral(std::string const &numeral,unsigned radix = 10);
-  double evalFloat(std::string const &numeral);
-  unsigned long evalUnsigned(std::string const &numeral,unsigned default_base = 10);
-  signed long evalSigned(std::string const &numeral,unsigned default_base = 10);
-  }
-
-
-
-
-#endif

simgear/interpreter/ixlib_numeric.hh

@@ -1,127 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : numeric / order processing
-// ----------------------------------------------------------------------------
-//  (c) Copyright 1996 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#ifndef IXLIB_NUMERIC
-#define IXLIB_NUMERIC
-
-
-
-
-#include <cstring>
-#include <ixlib_base.hh>
-#include <ixlib_exgen.hh>
-
-
-
-
-// Macros ---------------------------------------------------------------------
-#ifdef _GNUC_
-  #define NUM_MIN(a,b) ( (a)<?(b) )
-  #define NUM_MAX(a,b) ( (a)>?(b) )
-  #define NUM_ABS(a)   ( (a)<0 ? (-(a)) : (a) )
-#else
-  #define NUM_MIN(a,b) ( (a)<(b) ? (a) : (b) )
-  #define NUM_MAX(a,b) ( (a)>(b) ? (a) : (b) )
-  #define NUM_ABS(a)   ( (a)<0 ? (-(a)) : (a) )
-#endif
-
-#define NUM_LIMIT(lower,value,upper) \
-  ( NUM_MAX(lower,NUM_MIN(upper,vallue)) )
-#define NUM_INBOUND(lower,value,upper) \
-  (((lower) <= (value)) && ((value) <= (upper)))
-#define NUM_OVERLAP(a1,a2,b1,b2) \
-  ((((a1)<=(b1))&&((a2)>(b1)))||(((a1)<(b2))&&((a2)>(b2)))||(((a1)>=(b1))&&((a2)<=(b2))))
-#define NUM_CIRCLEINC(index,size) \
-  ( ((index)+1) >= (size) ? 0 : ((index)+1) )
-#define NUM_CIRCLEDIST(head,tail,size) \
-  ( (head)<(tail) ? ((head)+(size)-(tail)) : ((head)-(tail)) )
-
-
-
-
-// Primitive inlines ---------------------------------------------------------
-namespace ixion {
-  inline signed short sgn(signed long value);
-  inline bool getBit(unsigned long value,char bit);
-  inline TUnsigned8 hiByte(TUnsigned16 value);
-  inline TUnsigned16 hiWord(TUnsigned32 value);
-  inline TUnsigned8 loByte(TUnsigned16 value);
-  inline TUnsigned16 loWord(TUnsigned32 value);
-  inline TUnsigned16 makeWord(TUnsigned8 hi,TUnsigned8 lo);
-  inline TUnsigned32 makeDWord(TUnsigned16 hi,TUnsigned16 lo);
-
-
-
-
-// BCD encoding ---------------------------------------------------------------
-  unsigned long unsigned2BCD(unsigned long value);
-  unsigned long BCD2unsigned(unsigned long value);
-
-
-
-
-// Primitive inlines ---------------------------------------------------------
-  inline signed short ixion::sgn(signed long value) {
-    return (value<0) ? -1 : ( (value>0) ? 1 : 0);
-    }
-  
-  
-  
-  
-  inline bool ixion::getBit(unsigned long value,char bit) {
-    return (value >> bit) & 1;
-    }
-  
-  
-  
-  
-  inline TUnsigned8 ixion::hiByte(TUnsigned16 value) {
-    return value >> 8;
-    }
-  
-  
-  
-  
-  inline TUnsigned16 ixion::hiWord(TUnsigned32 value) {
-    return value >> 16;
-    }
-  
-  
-  
-  
-  inline TUnsigned8 ixion::loByte(TUnsigned16 value) {
-    return value & 0xff;
-    }
-  
-  
-  
-  
-  inline TUnsigned16 ixion::loWord(TUnsigned32 value) {
-    return value & 0xffff;
-    }
-  
-  
-  
-  
-  inline TUnsigned16 ixion::makeWord(TUnsigned8 hi,TUnsigned8 lo) {
-    return (TUnsigned16) hi << 8 | lo;
-    }
-  
-  
-  
-  
-  inline TUnsigned32 ixion::makeDWord(TUnsigned16 hi,TUnsigned16 lo) {
-    return (TUnsigned32) hi << 16 | lo;
-    }
-  }
-
-
-
-
-#endif

simgear/interpreter/ixlib_random.hh

@@ -1,82 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : Random numbers
-// ----------------------------------------------------------------------------
-//  (c) Copyright 1996 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#ifndef IXLIB_RANDOM
-#define IXLIB_RANDOM
-
-
-
-
-#include <cstdlib>
-#include <cmath>
-#include <ctime>
-#include <ixlib_base.hh>
-#include <ixlib_numeric.hh>
-
-
-
-
-namespace ixion {
-  class float_random {
-    double Seed;
-  
-    public:
-    float_random()
-      : Seed(1)
-      { }
-  
-    void init() { 
-      double current_time = time(NULL);
-      Seed = current_time*sin(current_time); 
-      }
-    void init(double seed)
-      { Seed = NUM_ABS(seed); }
-
-    /// Generate one random number in the interval [0,max).
-    double operator()(double max = 1) {
-      // normalize
-      while (Seed > 3) Seed = log(Seed);
-      Seed -= floor(Seed);
-      Seed = pow(Seed+Pi,8);
-      Seed -= floor(Seed);
-      return Seed*max;
-      }
-    };
-  
-  
-  
-  
-  class int_random {
-      float_random	Generator;
-  
-    public:
-      int_random()
-        { }
-    
-      void init()
-        { Generator.init(); }
-      void init(unsigned seed)
-        { Generator.init(seed); }
-      
-      /// Generate one random number in the interval [0,max).
-      unsigned operator()(unsigned max = 32768) {
-        unsigned num = rng8() + (rng8() << 7) + (rng8() << 14) + (rng8() << 21) + (rng8() << 28);
-        return num % max;
-        }
-    private:
-      TUnsigned8 rng8() {
-        return (TUnsigned8) (Generator()*256);
-        }
-    };
-  }
-
-
-
-
-#endif

simgear/interpreter/ixlib_re.hh

@@ -1,493 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : Regular expressions string object
-// ----------------------------------------------------------------------------
-//  (c) Copyright 1998 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#ifndef IXLIB_RE
-#define IXLIB_RE
-
-
-
-
-#include <vector>
-#include <memory>
-#include <ixlib_exgen.hh>
-#include <ixlib_string.hh>
-
-
-
-
-// Regex exceptions -----------------------------------------------------------
-#define ECRE_INVQUANTIFIER              0
-#define ECRE_UNBALBACKREF               1
-#define ECRE_INVESCAPE                  2
-#define ECRE_INVBACKREF                 3
-#define ECRE_UNTERMCLASS                4
-#define ECRE_NOPATTERN			5
-
-
-
-
-namespace ixion {
-  class regex_exception : public base_exception {
-    public:
-    regex_exception(TErrorCode error,char const *info = NULL,char *module = NULL,TIndex line = 0);
-    virtual char *getText() const;
-    };
-  }
-
-
-
-
-// Regex token macros ---------------------------------------------------------
-#define XSTRRE_LITERAL          '\\'
-#define XSTRRE_BACKREF          '\\'
-#define XSTRRE_ESCAPESEQ        '\\'
-#define XSTRRE_ANYCHAR          '.'
-#define XSTRRE_START            '^'
-#define XSTRRE_END              '$'
-#define XSTRRE_ALTERNATIVE      '|'
-#define XSTRRE_CLASSSTART       '['
-#define XSTRRE_CLASSNEG         '^'
-#define XSTRRE_CLASSRANGE       '-'
-#define XSTRRE_CLASSSTOP        ']'
-
-#define XSTRRE_BACKREFSTART     '('
-#define XSTRRE_BACKREFSTOP      ')'
-
-#define XSTRREQ_0PLUS           '*'
-#define XSTRREQ_1PLUS           '+'
-#define XSTRREQ_01              '?'
-#define XSTRREQ_START           '{'
-#define XSTRREQ_RANGE           ','
-#define XSTRREQ_STOP            '}'
-#define XSTRREQ_NONGREEDY       '?'
-
-
-
-
-namespace ixion {
-  /**
-  A class implementing a generic regular expression matcher not only for strings.
-  If you are looking for a usual regular expresion parser, look at 
-  ixion::regex_string.
-  
-  If you query anything about the last match, and that last match did
-  never happen, behavior is undefined.
-  */
-  
-  template<class T>
-  class regex {
-    protected:
-      // various helper classes -----------------------------------------------
-      class backref_stack {
-        private:
-          struct backref_entry {
-            enum { OPEN,CLOSE }           	Type;
-            TIndex                        	Index;
-            };
-          
-          typedef std::vector<backref_entry>	internal_stack;
-          
-          internal_stack                  	Stack;
-        
-	public:
-          typedef TSize                   	rewind_info;
-          
-          void open(TIndex index);
-          void close(TIndex index);
-          
-          rewind_info getRewindInfo() const;
-          void rewind(rewind_info ri);
-          void clear();
-          
-          TSize size();
-          T get(TIndex number,T const &candidate) const;
-        };
-
-
-
-
-      // matchers -------------------------------------------------------------
-      class matcher {
-        protected:
-          matcher                   *Next;
-          bool                      OwnNext;
-          TSize                     MatchLength;
-      
-        public:
-          matcher();
-          virtual ~matcher();
-	  
-	  virtual matcher *duplicate() const = 0;
-          
-          TSize getMatchLength() const { 
-            return MatchLength; 
-            }
-          TSize subsequentMatchLength() const;
-          virtual TSize minimumMatchLength() const = 0;
-          TSize minimumSubsequentMatchLength() const;
-  
-          matcher *getNext() const { 
-            return Next; 
-            }
-          virtual void setNext(matcher *next,bool ownnext = true) {
-            Next = next;
-            OwnNext = ownnext;
-            }
-          
-	  // this routine must set the MatchLength member correctly.
-	  virtual bool match(backref_stack &brstack,T const &candidate,TIndex at)
-            = 0;
-      
-        protected:
-          bool matchNext(backref_stack &brstack,T const &candidate,TIndex at) const { 
-            return Next ? Next->match(brstack,candidate,at) : true; 
-            }
-	  void copy(matcher const *src);
-        };
-    
-  
-  
-  
-      class quantifier : public matcher {
-        private:
-	  typedef matcher	    super;
-          bool                      Greedy,MaxValid;
-          TSize                     MinCount,MaxCount;
-          matcher                   *Quantified;
-    
-        struct backtrack_stack_entry {
-          TIndex                          Index;
-          backref_stack::rewind_info      RewindInfo;
-          };
-  
-        public:
-	  quantifier() 
-	    : Quantified(NULL) {
-	    }
-          quantifier(bool greedy,TSize mincount);
-          quantifier(bool greedy,TSize mincount,TSize maxcount);
-          ~quantifier();
-      
-	  matcher *duplicate() const;
-          
-          TSize minimumMatchLength() const;
-          
-          void setQuantified(matcher *quantified) { 
-            Quantified = quantified;
-            }
-          bool match(backref_stack &brstack,T const &candidate,TIndex at);
-
-	protected:
-	  void copy(quantifier const *src);
-        };
-    
-  
-  
-  
-      class sequence_matcher : public matcher {
-          T               MatchStr;
-      
-        public:
-          sequence_matcher(T const &matchstr);
-
-	  matcher *duplicate() const;
-
-          TSize minimumMatchLength() const {
-            return MatchStr.size();
-            }
-          bool match(backref_stack &brstack,T const &candidate,TIndex at);
-        };
-    
-  
-  
-  
-      class any_matcher : public matcher {
-        public:
-          any_matcher() { 
-            MatchLength = 1; 
-            }
-
-	  matcher *duplicate() const;
-
-          TSize minimumMatchLength() const {
-            return 1;
-            }
-          bool match(backref_stack &brstack,T const &candidate,TIndex at) { 
-            return at < candidate.size() && matchNext(brstack,candidate,at+1); 
-            }
-        };
-    
-  
-  
-  
-      class start_matcher : public matcher {
-        public:
-          start_matcher() { 
-            MatchLength = 0; 
-            }
-
-	  matcher *duplicate() const;
-
-          TSize minimumMatchLength() const {
-            return 0;
-            }
-          bool match(backref_stack &brstack,T const &candidate,TIndex at);
-        };
-    
-  
-  
-  
-      class end_matcher : public matcher {
-        public:
-          end_matcher() { 
-            MatchLength = 0;
-            }
-
-	  matcher *duplicate() const;
-
-          TSize minimumMatchLength() const {
-            return 0;
-            }
-          bool match(backref_stack &brstack,T const &candidate,TIndex at);
-        };
-    
-  
-  
-  
-      class backref_open_matcher : public matcher {
-        public:
-          backref_open_matcher() { 
-            MatchLength = 0; 
-            }
-
-	  matcher *duplicate() const;
-
-          TSize minimumMatchLength() const {
-            return 0;
-            }
-          bool match(backref_stack &brstack,T const &candidate,TIndex at);
-        };
-    
-  
-
-
-      class backref_close_matcher : public matcher {
-        public:
-          backref_close_matcher() { 
-            MatchLength = 0; 
-            }
-
-	  matcher *duplicate() const;
-
-          TSize minimumMatchLength() const {
-            return 0;
-            }
-          bool match(backref_stack &brstack,T const &candidate,TIndex at);
-        };
-
-
-
-
-      class alternative_matcher : public matcher {
-          // The connector serves two purposes:
-          // a) be a null-matcher that re-unites the different alternate token
-          //    sequences
-          // b) make the end of each sequence identifiable to be able to compute
-          //    the match length
-        
-          class connector : public matcher {
-            public:
-	      matcher *duplicate() const {
-	        return NULL;
-		}
-
-              TSize minimumMatchLength() const {
-                return 0;
-                }
-              bool match(backref_stack &brstack,T const &candidate,TIndex at);
-            };
-
-          typedef matcher		  super;
-	  typedef std::vector<matcher *>  alt_list;
-          alt_list                        AltList;
-          connector                       Connector;
-      
-        public:
-          ~alternative_matcher();
-  
-	  matcher *duplicate() const;
-
-          TSize minimumMatchLength() const;
-          void setNext(matcher *next,bool ownnext = true);
-          void addAlternative(matcher *alternative);
-          bool match(backref_stack &brstack,T const &candidate,TIndex at);
-
-        protected:
-	  void copy(alternative_matcher const *src);
-        };
-    
-
-
-
-      class backref_matcher : public matcher {
-          TIndex Backref;
-    
-        public:
-          backref_matcher(TIndex backref);
-
-	  matcher *duplicate() const;
-
-          TSize minimumMatchLength() const {
-            return 0;
-            }
-          bool match(backref_stack &brstack,T const &candidate,TIndex at);
-        };
-    
-      // instance data --------------------------------------------------------
-      std::auto_ptr<matcher>      ParsedRegex;
-      backref_stack               BackrefStack;
-      T                           LastCandidate;
-      TIndex                      MatchIndex;
-      TSize                       MatchLength;
-  
-    public:
-      // interface ------------------------------------------------------------
-      regex();
-      regex(regex const &src);
-
-      regex &operator=(regex const &src);
-      
-      bool match(T const &candidate,TIndex from = 0);
-      bool matchAt(T const &candidate,TIndex at = 0);
-    
-      // Queries pertaining to the last match
-      TIndex getMatchIndex() { 
-        return MatchIndex; 
-	}
-      TSize getMatchLength() { 
-        return MatchLength; 
-	}
-      std::string getMatch() { 
-        return T(LastCandidate.begin()+MatchIndex,
-	   LastCandidate.begin()+MatchIndex+MatchLength); 
-	}
-      TSize countBackrefs() { 
-        return BackrefStack.size(); 
-	}
-      T getBackref(TIndex index) { 
-        return BackrefStack.get(index,LastCandidate); 
-	}
-    };
-  
-
-
-  /**
-  A regular expression parser and matcher.
-  
-  Backref numbering starts at \0.
-
-  ReplaceAll does not set the MatchIndex/MatchGlobal members.
-
-  What is there is compatible with perl5. (See man perlre or
-  http://www.cpan.org/doc/manual/html/pod/perlre.html)
-  However, not everything is there. Here's what's missing:
-  
-  <ul>
-    <li> \Q-\E,\b,\B,\A,\Z,\z
-    <li> discerning between line and string
-    <li> (?#comments)
-    <li> (?:clustering)
-    <li> (?=positive lookahead assumptions)
-    <li> (?!negative lookahead assumptions
-    <li> (?<=positive lookbehind assumptions)
-    <li> (?<!negative lookbehind assumptions
-    <li> (?>independent substrings)
-    <li> modifiers such as "case independent"
-    </ul>
-    
-  as well as all the stuff involving perl code, naturally.
-  None of these is actually hard to hack in. If you want them,
-  pester me or try for yourself (and submit patches!)
-  */
-  class regex_string : public regex<std::string> {
-    private:
-      class class_matcher : public regex<std::string>::matcher {
-        private:
-	  typedef regex<std::string>::matcher	super;
-          static TSize const      		CharValues = 256;
-          bool                    		Set[CharValues];
-          bool                    		Negated;
-
-        public:
-	  class_matcher();
-          class_matcher(std::string const &cls);
-
-	  matcher *duplicate() const;
-
-          TSize minimumMatchLength() const {
-            return 1;
-            }
-          bool match(backref_stack &brstack,std::string const &candidate,TIndex at);
-      
-        private:
-          void expandClass(std::string const &cls);
-	
-	protected:
-	  void copy(class_matcher const *src);
-        };
-
-
-
-
-      class special_class_matcher : public regex<std::string>::matcher {
-        public:
-          enum type { DIGIT,NONDIGIT,ALNUM,NONALNUM,SPACE,NONSPACE };
-  
-        private:
-          type		Type;
-  
-        public:
-          special_class_matcher(type tp);
-
-	  matcher *duplicate() const;
-
-          TSize minimumMatchLength() const {
-            return 1;
-            }
-          bool match(backref_stack &brstack,std::string const &candidate,TIndex at);
-        };
-
-
-
-
-    public:
-      regex_string() {
-        }
-      regex_string(std::string const &str) {
-	parse(str);
-	}
-      regex_string(char const *s) {
-	parse(s);
-        }
-
-      void parse(std::string const &expr);
-
-      std::string replaceAll(std::string const &candidate,std::string const &replacement,
-        TIndex from = 0);
-
-    private:
-      regex<std::string>::matcher *parseRegex(std::string const &expr);
-      quantifier *parseQuantifier(std::string const &expr,TIndex &at);
-      bool isGreedy(std::string const &expr,TIndex &at);
-    };
-  }
-
-
-
-#endif

simgear/interpreter/ixlib_re_impl.hh

@@ -1,652 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : Regular expressions string object.
-// ----------------------------------------------------------------------------
-//  (c) Copyright 1998 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#include <stack>
-#include <cctype>
-#include "ixlib_i18n.hh"
-#include <ixlib_exgen.hh>
-#include <ixlib_numeric.hh>
-#include <ixlib_numconv.hh>
-#include <ixlib_re.hh>
-
-
-
-
-// regex::backref_stack -------------------------------------------------------
-template<class T>
-void ixion::regex<T>::backref_stack::open(TIndex index) {
-  backref_entry entry = { backref_entry::OPEN,index };
-  Stack.push_back(entry);
-  }
-
-
-
-
-template<class T>
-void ixion::regex<T>::backref_stack::close(TIndex index) {
-  backref_entry entry = { backref_entry::CLOSE,index };
-  Stack.push_back(entry);
-  }
-
-
-
-
-template<class T>
-ixion::regex<T>::backref_stack::rewind_info 
-ixion::regex<T>::backref_stack::getRewindInfo() const {
-  return Stack.size();
-  }
-
-
-
-
-template<class T>
-void ixion::regex<T>::backref_stack::rewind(rewind_info ri) {
-  Stack.erase(Stack.begin()+ri,Stack.end());
-  }
-
-
-
-
-template<class T>
-void ixion::regex<T>::backref_stack::clear() {
-  Stack.clear();
-  }
-
-
-
-
-template<class T>
-ixion::TSize ixion::regex<T>::backref_stack::size() {
-  TSize result = 0;
-  FOREACH_CONST(first,Stack,internal_stack)
-    if (first->Type == backref_entry::OPEN) result++;
-  return result;
-  }
-
-
-
-
-template<class T>
-T ixion::regex<T>::backref_stack::get(TIndex number,T const &candidate) const {
-  TIndex level = 0,next_index = 0;
-  TIndex start;
-  TIndex startlevel;
-  
-  internal_stack::const_iterator first = Stack.begin(),last = Stack.end();
-  while (first != last) {
-    if (first->Type == backref_entry::OPEN) {
-      if (number == next_index) {
-        start = first->Index;
-	startlevel = level;
- 	level++;
-        break;
-        }
-      next_index++;
-      level++;
-      }
-    if (first->Type == backref_entry::CLOSE) 
-      level--;
-    first++;
-    }
-  
-  if (first == last)
-    EX_THROW(regex,ECRE_INVBACKREF)
-
-  first++;
-    
-  while (first != last) {
-    if (first->Type == backref_entry::OPEN) 
-      level++;
-    if (first->Type == backref_entry::CLOSE) {
-      level--;
-      if (startlevel == level)
-        return candidate.substr(start,first->Index - start);
-      }
-    first++;
-    }
-  EX_THROW(regex,ECRE_UNBALBACKREF)
-  }
-
-
-
-
-// regex::matcher -------------------------------------------------------------
-template<class T>
-ixion::regex<T>::matcher::matcher()
-  : Next(NULL) { 
-  }
-
-
-
-
-template<class T>
-ixion::regex<T>::matcher::~matcher() { 
-  if (Next && OwnNext) 
-    delete Next;
-  }
-
-
-
-
-template<class T>
-ixion::TSize ixion::regex<T>::matcher::subsequentMatchLength() const {
-  TSize totalml = 0;
-  matcher const *object = this;
-  while (object) {
-    totalml += object->MatchLength;
-    object = object->Next;
-    }
-  return totalml;
-  }
-
-
-
-
-template<class T>
-ixion::TSize ixion::regex<T>::matcher::minimumSubsequentMatchLength() const  {
-  TSize totalml = 0;
-  matcher const *object = this;
-  while (object) {
-    totalml += object->minimumMatchLength();
-    object = object->Next;
-    }
-  return totalml;
-  }
-
-
-
-
-template<class T>
-void ixion::regex<T>::matcher::copy(matcher const *src) {
-  if (src->Next && src->OwnNext)
-    setNext(src->Next->duplicate(),src->OwnNext);
-  else
-    setNext(NULL);
-  }
-
-
-
-
-// regex::quantifier ----------------------------------------------------------
-template<class T>
-ixion::regex<T>::quantifier::quantifier(bool greedy,TSize mincount)
-  : Greedy(greedy),MaxValid(false),MinCount(mincount) { 
-  }
-
-
-
-
-template<class T>
-ixion::regex<T>::quantifier::quantifier(bool greedy,TSize mincount,TSize maxcount)
-  : Greedy(greedy),MaxValid(true),MinCount(mincount),MaxCount(maxcount) { 
-  }
-
-
-
-
-template<class T>
-ixion::regex<T>::quantifier::~quantifier() { 
-  if (Quantified) 
-    delete Quantified; 
-  }
-
-
-
-
-template<class T>
-ixion::regex<T>::matcher *ixion::regex<T>::quantifier::duplicate() const {
-  quantifier *dupe = new quantifier();
-  dupe->copy(this);
-  return dupe;
-  }
-
-
-
-
-template<class T>
-ixion::TSize ixion::regex<T>::quantifier::minimumMatchLength() const {
-  if (Quantified) 
-    return MinCount * Quantified->minimumMatchLength();
-  else 
-    return 0;
-  }
-
-
-
-
-template<class T>
-bool ixion::regex<T>::quantifier::match(backref_stack &brstack,T const &candidate,TIndex at) {
-  // this routine does speculative matching, so it must pay close attention
-  // to rewind the backref stack appropriately.
-  // NB: matchNext does the rewinding automatically, whereas speculative
-  // matches of the quantified portion must be rewound.
-  
-  // There should be at least one character in each match, we'd
-  // run to Baghdad otherwise.
-  
-  if (!Quantified) 
-    return matchNext(brstack,candidate,at);
-  
-  // calculate accurate maximum match count
-  TSize quant_min = Quantified->minimumSubsequentMatchLength();
-  if (quant_min == 0) quant_min = 1;
-  
-  TSize max_count = candidate.size() - at;
-  if (Next) max_count -= Next->minimumSubsequentMatchLength();
-  max_count = max_count/quant_min + 1;
-  
-  if (MaxValid) max_count = NUM_MIN(max_count,MaxCount);
-  
-  // check that at least MinCount matches take place (non-speculative)
-  TIndex idx = at;
-  for (TSize c = 1;c <= MinCount;c++)
-    if (Quantified->match(brstack,candidate,idx))
-      idx += Quantified->subsequentMatchLength();
-    else 
-      return false;
-  
-  // determine number of remaining matches
-  TSize remcount = max_count-MinCount;
-  
-  // test for the remaining matches in a way that depends on Greedy flag
-  if (Greedy) {
-    // try to gobble up as many matches of quantified part as possible
-    // (speculative)
-    
-    std::stack<backtrack_stack_entry> successful_indices;
-    { backtrack_stack_entry entry = { idx,brstack.getRewindInfo() };
-      successful_indices.push(entry);
-      }
-    
-    while (Quantified->match(brstack,candidate,idx) && successful_indices.size()-1 < remcount) {
-      idx += Quantified->subsequentMatchLength();
-      backtrack_stack_entry entry = { idx,brstack.getRewindInfo() };
-      successful_indices.push(entry);
-      }
-    
-    // backtrack until rest of sequence also matches
-    while (successful_indices.size() && !matchNext(brstack,candidate,successful_indices.top().Index)) {
-      brstack.rewind(successful_indices.top().RewindInfo);
-      successful_indices.pop();
-      }
-    
-    if (successful_indices.size()) {
-      MatchLength = successful_indices.top().Index - at;
-      return true;
-      }
-    else return false;
-    }
-  else {
-    for (TSize c = 0;c <= remcount;c++) {
-      if (matchNext(brstack,candidate,idx)) {
-        MatchLength = idx-at;
-        return true;
-        }
-      // following part runs once too much, effectively: 
-      // if c == remcount, idx may be increased, but the search fails anyway
-      // => no problem
-      if (Quantified->match(brstack,candidate,idx))
-        idx += Quantified->subsequentMatchLength();
-      else 
-        return false;
-      }
-    return false;
-    }
-  }
-
-
-
-
-template<class T>
-void ixion::regex<T>::quantifier::copy(quantifier const *src) {
-  super::copy(src);
-  Greedy = src->Greedy;
-  MaxValid = src->MaxValid;
-  MinCount = src->MinCount;
-  MaxCount = src->MaxCount;
-  Quantified = src->Quantified->duplicate();
-  }
-
-
-
-
-// regex::sequence_matcher ------------------------------------------------------
-template<class T>
-ixion::regex<T>::sequence_matcher::sequence_matcher(T const &matchstr)
-  : MatchStr(matchstr) { 
-  MatchLength = MatchStr.size(); 
-  }
-
-
-
-
-template<class T>
-ixion::regex<T>::matcher *ixion::regex<T>::sequence_matcher::duplicate() const {
-  sequence_matcher *dupe = new sequence_matcher(MatchStr);
-  dupe->copy(this);
-  return dupe;
-  }
-
-
-
-
-template<class T>
-bool ixion::regex<T>::sequence_matcher::match(backref_stack &brstack,T const &candidate,TIndex at) {
-  if (at+MatchStr.size() > candidate.size()) return false;
-  return (T(candidate.begin()+at,candidate.begin()+at+MatchStr.size()) == MatchStr) &&
-    matchNext(brstack,candidate,at+MatchStr.size());
-  }
-
-
-
-
-// regex::any_matcher ---------------------------------------------------------
-template<class T>
-ixion::regex<T>::matcher *ixion::regex<T>::any_matcher::duplicate() const {
-  any_matcher *dupe = new any_matcher();
-  dupe->copy(this);
-  return dupe;
-  }
-
-
-
-
-// regex::start_matcher ---------------------------------------------------------
-template<class T>
-ixion::regex<T>::matcher *ixion::regex<T>::start_matcher::duplicate() const {
-  start_matcher *dupe = new start_matcher();
-  dupe->copy(this);
-  return dupe;
-  }
-
-
-
-
-template<class T>
-bool ixion::regex<T>::start_matcher::match(backref_stack &brstack,T const &candidate,TIndex at) { 
-  return (at == 0) && matchNext(brstack,candidate,at);
-  }
-
-
-
-
-// regex::end_matcher ---------------------------------------------------------
-template<class T>
-ixion::regex<T>::matcher *ixion::regex<T>::end_matcher::duplicate() const {
-  end_matcher *dupe = new end_matcher();
-  dupe->copy(this);
-  return dupe;
-  }
-
-
-
-
-template<class T>
-bool ixion::regex<T>::end_matcher::match(backref_stack &brstack,T const &candidate,TIndex at) { 
-  return (at == candidate.size()) && matchNext(brstack,candidate,at);
-  }
-
-
-
-
-// regex::backref_open_matcher ------------------------------------------------
-template<class T>
-ixion::regex<T>::matcher *ixion::regex<T>::backref_open_matcher::duplicate() const {
-  backref_open_matcher *dupe = new backref_open_matcher();
-  dupe->copy(this);
-  return dupe;
-  }
-
-
-
-
-template<class T>
-bool ixion::regex<T>::backref_open_matcher::match(backref_stack &brstack,T const &candidate,TIndex at) {
-  backref_stack::rewind_info ri = brstack.getRewindInfo();
-  brstack.open(at);
-  
-  bool result = matchNext(brstack,candidate,at);
-
-  if (!result)
-    brstack.rewind(ri);
-  return result;
-  }
-
-
-
-
-// regex::backref_close_matcher -----------------------------------------------
-template<class T>
-ixion::regex<T>::matcher *ixion::regex<T>::backref_close_matcher::duplicate() const {
-  backref_close_matcher *dupe = new backref_close_matcher();
-  dupe->copy(this);
-  return dupe;
-  }
-
-
-
-
-template<class T>
-bool ixion::regex<T>::backref_close_matcher::match(backref_stack &brstack,T const &candidate,TIndex at) {
-  backref_stack::rewind_info ri = brstack.getRewindInfo();
-  brstack.close(at);
-  
-  bool result = matchNext(brstack,candidate,at);
-
-  if (!result)
-    brstack.rewind(ri);
-  return result;
-  }
-
-
-
-
-// regex::alternative_matcher::connector --------------------------------------
-template<class T>
-bool ixion::regex<T>::alternative_matcher::connector::match(backref_stack &brstack,T const &candidate,TIndex at) {
-  return matchNext(brstack,candidate,at);
-  }
-
-
-
-
-// regex::alternative_matcher -------------------------------------------------
-template<class T>
-ixion::regex<T>::alternative_matcher::~alternative_matcher() {
-  while (AltList.size()) {
-    delete AltList.back();
-    AltList.pop_back();
-    }
-  }
-
-
-
-
-template<class T>
-ixion::regex<T>::matcher *ixion::regex<T>::alternative_matcher::duplicate() const {
-  alternative_matcher *dupe = new alternative_matcher();
-  dupe->copy(this);
-  return dupe;
-  }
-
-
-
-
-template<class T>
-ixion::TSize ixion::regex<T>::alternative_matcher::minimumMatchLength() const {
-  TSize result = 0;
-  bool is_first = true;
-  
-  FOREACH_CONST(first,AltList,alt_list)
-    if (is_first) {
-      result = (*first)->minimumMatchLength();
-      is_first = true;
-      }
-    else {
-      TSize current = (*first)->minimumMatchLength();
-      if (current < result) result = current;
-      }
-  return result;
-  }
-
-
-
-
-template<class T>
-void ixion::regex<T>::alternative_matcher::setNext(matcher *next,bool ownnext = true) {
-  matcher::setNext(next);
-  Connector.setNext(next,false);
-  }
-
-
-
-
-template<class T>
-void ixion::regex<T>::alternative_matcher::addAlternative(matcher *alternative) {
-  AltList.push_back(alternative);
-  matcher *searchlast = alternative,*last = NULL;
-  while (searchlast) {
-    last = searchlast;
-    searchlast = searchlast->getNext();
-    }
-  last->setNext(&Connector,false);
-  }
-
-
-
-
-template<class T>
-bool ixion::regex<T>::alternative_matcher::match(backref_stack &brstack,T const &candidate,TIndex at) {
-  std::vector<matcher *>::iterator first = AltList.begin(),last = AltList.end();
-  while (first != last) {
-    if ((*first)->match(brstack,candidate,at)) {
-      MatchLength = 0;
-      matcher const *object = *first;
-      while (object != &Connector) {
-        MatchLength += object->getMatchLength();
-        object = object->getNext();
-        }
-      return true;
-      }
-    first++;
-    }
-  return false;
-  }
-
-
-
-
-template<class T>
-void ixion::regex<T>::alternative_matcher::copy(alternative_matcher const *src) {
-  super::copy(src);
-  Connector.setNext(Next,false);
-  
-  FOREACH_CONST(first,src->AltList,alt_list)
-    addAlternative((*first)->duplicate());
-  }
-
-
-
-
-// regex::backref_matcher -----------------------------------------------------
-template<class T>
-ixion::regex<T>::backref_matcher::backref_matcher(TIndex backref)
-  : Backref(backref) { 
-  }
-
-
-
-
-template<class T>
-ixion::regex<T>::matcher *ixion::regex<T>::backref_matcher::duplicate() const {
-  backref_matcher *dupe = new backref_matcher(Backref);
-  dupe->copy(this);
-  return dupe;
-  }
-
-
-
-
-template<class T>
-bool ixion::regex<T>::backref_matcher::match(backref_stack &brstack,T const &candidate,TIndex at) {
-  T matchstr = brstack.get(Backref,candidate);
-  MatchLength = matchstr.size();
-
-  if (at+matchstr.size() > candidate.size()) return false;
-  return (T(candidate.begin()+at,candidate.begin()+at+matchstr.size()) == matchstr) &&
-    matchNext(brstack,candidate,at+matchstr.size());
-  }
-
-
-
-
-// regex ----------------------------------------------------------------------
-template<class T>
-ixion::regex<T>::regex()
-  : MatchIndex(0),MatchLength(0) { 
-  }
-
-
-
-
-template<class T>
-ixion::regex<T>::regex(regex const &src)
-  : ParsedRegex(src.ParsedRegex->duplicate()),
-  MatchIndex(0),MatchLength(0) {
-  }
-
-
-
-
-template<class T>
-ixion::regex<T> &ixion::regex<T>::operator=(regex const &src) {
-  std::auto_ptr<matcher> regex_copy(src.ParsedRegex->duplicate());
-  ParsedRegex = regex_copy;
-  return *this;
-  }
-
-
-
-
-template<class T>
-bool ixion::regex<T>::match(T const &candidate,TIndex from) {
-  LastCandidate = candidate;
-  BackrefStack.clear();
-
-  if (ParsedRegex.get() == NULL)
-    EX_THROW(regex,ECRE_NOPATTERN)
-
-  for (TIndex index = from;index < candidate.size();index++)
-    if (ParsedRegex->match(BackrefStack,candidate,index)) {
-      MatchIndex = index;
-      MatchLength = ParsedRegex->subsequentMatchLength();
-      return true;
-      }
-  return false;
-  }
-
-
-
-
-template<class T>
-bool ixion::regex<T>::matchAt(T const &candidate,TIndex at) {
-  LastCandidate = candidate;
-  BackrefStack.clear();
-
-  if (ParsedRegex.get() == NULL)
-    EX_THROW(regex,ECRE_NOPATTERN)
-
-  if (ParsedRegex->match(BackrefStack,candidate,at)) {
-    MatchIndex = at;
-    MatchLength = ParsedRegex->subsequentMatchLength();
-    return true;
-    }
-  return false;
-  }

simgear/interpreter/ixlib_scanjs.hh

@@ -1,24 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : Javascript scanner
-// ----------------------------------------------------------------------------
-//  (c) Copyright 2000 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#ifndef IXLIB_SCANJS
-#define IXLIB_SCANJS
-
-
-
-
-#undef yyFlexLexer
-#define yyFlexLexer jsFlexLexer
-#include <FlexLexer.h>
-#undef yyFlexLexer
-
-
-
-
-#endif

simgear/interpreter/ixlib_scanner.hh

@@ -1,75 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : scanner wrapper for FlexLexer
-// ----------------------------------------------------------------------------
-//  (c) Copyright 1999 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#ifndef IXLIB_SCANNER
-#define IXLIB_SCANNER
-
-
-
-
-#include <ixlib_base.hh>
-#include <ixlib_exbase.hh>
-#include <vector>
-#include <ixlib_string.hh>
-
-
-
-
-class FlexLexer;
-
-
-
-
-// possible errors during execution -------------------------------------------
-#define ECSCAN_UNKNOWN_TOKEN      	0
-#define ECSCAN_EOF		      	1
-
-
-
-
-// scanner_exception ----------------------------------------------------------
-namespace ixion {
-  struct scanner_exception : public base_exception {
-    scanner_exception(TErrorCode const error,TIndex const line,std::string const &info);
-    virtual char *getText() const;
-    };
-
-
-
-
-// scanner --------------------------------------------------------------------
-  class scanner {
-    public:
-      typedef unsigned 	token_type;
-      
-      struct token {
-        token_type    		Type;
-        TIndex        		Line;
-        std::string       	Text;
-        };
-  
-      typedef std::vector<token>		token_list;
-      typedef std::vector<token>::iterator	token_iterator;
-  
-      scanner(FlexLexer &lexer);
-      token_list scan();
-    
-    protected:
-      FlexLexer	&Lexer;
-      token	CurrentToken;	
-
-      token getNextToken();
-      bool reachedEOF() const;
-    };
-  }
-
-
-
-
-#endif

simgear/interpreter/ixlib_string.hh

@@ -1,64 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : String crunching tools
-// ----------------------------------------------------------------------------
-//  (c) Copyright 1999 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#ifndef IXLIB_STRING
-#define IXLIB_STRING
-
-
-
-
-#include <string>
-#include <ixlib_base.hh>
-#include <ixlib_exgen.hh>
-
-
-
-
-namespace ixion {
-  template<class InputIterator>
-  inline std::string concat(InputIterator first,InputIterator last,std::string const &sep = " ") {
-    std::string str;
-    while (first != last) {
-      if (str.size()) str += sep;
-      str += *first++;
-      }
-    return str;
-    }
-  
-  
-  
-  
-  std::string findReplace(std::string const &target,std::string const &src,std::string const &dest);
-  std::string findReplace(std::string const &target,char* src,char *dest);
-  std::string findReplace(std::string const &target,char src,char dest);
-  std::string upper(std::string const &original);
-  std::string lower(std::string const &original);
-  std::string removeLeading(std::string const &original,char ch = ' ');
-  std::string removeTrailing(std::string const &original,char ch = ' ');
-  std::string removeLeadingTrailing(std::string const &original,char ch = ' ');
-  std::string parseCEscapes(std::string const &original);
-  
-  TSize getMaxBase64DecodedSize(TSize encoded);
-  // data must provide enough space for the maximal size determined by the
-  // above function
-  TSize base64decode(TByte *data,std::string const &base64);
-  void base64encode(std::string &base64,TByte const *data,TSize size);
-
-
-
-
-  class string_hash {
-    public:
-      unsigned long operator()(std::string const &str) const;
-    };
-  }
-
-
-
-#endif

simgear/interpreter/ixlib_token_javascript.hh

@@ -1,85 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : Token definitions for Javascript scanner
-// ----------------------------------------------------------------------------
-//  (c) Copyright 2000 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#ifndef IXLIB_TOKEN_JAVASCRIPT
-#define IXLIB_TOKEN_JAVASCRIPT
-
-
-
-
-#include <ixlib_token_lex.hh>
-
-
-
-
-// keywords
-#define TT_JS_THIS			(TT_USER + 0)
-#define TT_JS_FUNCTION			(TT_USER + 1)
-#define TT_JS_VAR			(TT_USER + 2)
-#define TT_JS_NULL			(TT_USER + 3)
-#define TT_JS_IF			(TT_USER + 4)
-#define TT_JS_WHILE			(TT_USER + 5)
-#define TT_JS_DO			(TT_USER + 6)
-#define TT_JS_ELSE			(TT_USER + 7)
-#define TT_JS_FOR			(TT_USER + 8)
-#define TT_JS_RETURN			(TT_USER + 9)
-#define TT_JS_SWITCH			(TT_USER + 10)
-#define TT_JS_CASE			(TT_USER + 11)
-#define TT_JS_CONTINUE			(TT_USER + 12)
-#define TT_JS_BREAK			(TT_USER + 13)
-#define TT_JS_DEFAULT			(TT_USER + 14)
-#define TT_JS_IN			(TT_USER + 15)
-#define TT_JS_CONST			(TT_USER + 16)
-#define TT_JS_CLASS			(TT_USER + 17)
-#define TT_JS_EXTENDS			(TT_USER + 18)
-#define TT_JS_NAMESPACE			(TT_USER + 19)
-#define TT_JS_STATIC			(TT_USER + 20)
-#define TT_JS_CONSTRUCTOR		(TT_USER + 21)
-
-// operators
-#define TT_JS_NEW			(TT_USER + 1024)
-
-#define TT_JS_PLUS_ASSIGN		(TT_USER + 1025)
-#define TT_JS_MINUS_ASSIGN		(TT_USER + 1026)
-#define TT_JS_MULTIPLY_ASSIGN		(TT_USER + 1027)
-#define TT_JS_DIVIDE_ASSIGN		(TT_USER + 1028)
-#define TT_JS_MODULO_ASSIGN		(TT_USER + 1029)
-#define TT_JS_BIT_XOR_ASSIGN		(TT_USER + 1030)
-#define TT_JS_BIT_AND_ASSIGN		(TT_USER + 1031)
-#define TT_JS_BIT_OR_ASSIGN		(TT_USER + 1032)
-#define TT_JS_LEFT_SHIFT		(TT_USER + 1033)
-#define TT_JS_RIGHT_SHIFT		(TT_USER + 1034)
-#define TT_JS_LEFT_SHIFT_ASSIGN		(TT_USER + 1035)
-#define TT_JS_RIGHT_SHIFT_ASSIGN	(TT_USER + 1036)
-#define TT_JS_EQUAL			(TT_USER + 1037)
-#define TT_JS_NOT_EQUAL			(TT_USER + 1038)
-#define TT_JS_LESS_EQUAL		(TT_USER + 1039)
-#define TT_JS_GREATER_EQUAL		(TT_USER + 1040)
-#define TT_JS_LOGICAL_AND		(TT_USER + 1041)
-#define TT_JS_LOGICAL_OR		(TT_USER + 1042)
-#define TT_JS_INCREMENT			(TT_USER + 1043)
-#define TT_JS_DECREMENT			(TT_USER + 1044)
-#define TT_JS_IDENTICAL			(TT_USER + 1045)
-#define TT_JS_NOT_IDENTICAL		(TT_USER + 1046)
-
-// literals
-#define TT_JS_LIT_INT			(TT_USER + 2048)
-#define TT_JS_LIT_FLOAT			(TT_USER + 2049)
-#define TT_JS_LIT_STRING		(TT_USER + 2050)
-#define TT_JS_LIT_TRUE			(TT_USER + 2051)
-#define TT_JS_LIT_FALSE			(TT_USER + 2052)
-#define TT_JS_LIT_UNDEFINED		(TT_USER + 2053)
-
-// identifier
-#define TT_JS_IDENTIFIER		(TT_USER + 3072)
-
-
-
-
-#endif

simgear/interpreter/ixlib_token_lex.hh

@@ -1,25 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : Basic definitions
-// ----------------------------------------------------------------------------
-//  (c) Copyright 2000 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#ifndef IXLIB_TOKENLEX
-#define IXLIB_TOKENLEX
-
-
-
-
-// Basic token types
-#define TT_EOF				1024
-#define TT_UNKNOWN			1025
-#define TT_WHITESPACE			1026
-#define TT_USER				2048
-
-
-
-
-#endif

simgear/interpreter/js_array.cc

@@ -1,201 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : Javascript interpreter
-// ----------------------------------------------------------------------------
-//  (c) Copyright 2000 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#include <ixlib_js_internals.hh>
-
-
-
-
-using namespace ixion;
-using namespace javascript;
-
-
-
-
-// js_array -------------------------------------------------------------------
-js_array::
-js_array(TSize size) {
-  Array.resize(size);
-
-  ref<value> null = javascript::makeNull();
-  for (TIndex i = 0;i < size;i++)
-    Array[i] = makeLValue(null);
-  }
-
-
-
-
-string js_array::stringify() const {
-  value_array::const_iterator first = Array.begin(),last = Array.end();
-  
-  string result = "{ ";
-  bool at_first = true;
-  while (first != last) {
-    if (!at_first) result += ',';
-    else at_first = false;
-    result += (*first)->stringify();
-    first++;
-    }
-  return result + " }";
-  }
-
-
-
-
-ref<javascript::value> 
-js_array::
-duplicate() { 
-  ref<value> result = new js_array(*this);
-  return result;
-  }
-
-
-
-
-ref<javascript::value> 
-js_array::
-lookup(string const &identifier) {
-  if (identifier == "length") return javascript::makeConstant(Array.size());
-  return super::lookup(identifier);
-  }
-
-
-
-
-ref<javascript::value> 
-js_array::
-subscript(value const &index) {
-  TIndex idx = index.toInt();
-  return operator[](idx);
-  }
-
-
-
-
-ref<javascript::value> 
-js_array::
-callMethod(string const &id,parameter_list const &parameters) {
-  if (id == "pop" && parameters.size() == 0) {
-    if (Array.size() == 0) return javascript::makeNull();
-    else {
-      ref<value> back = Array.back();
-      Array.pop_back();
-      return back;
-      }
-    }
-  else if (id == "push") {
-    FOREACH_CONST(first,parameters,parameter_list) {
-      Array.push_back((*first)->duplicate());
-      }
-    return javascript::makeConstant(Array.size());
-    }
-  else if (id == "reverse" && parameters.size() == 0) {
-    reverse(Array.begin(),Array.end());
-    return this;
-    }
-  else if (id == "shift" && parameters.size() == 0) {
-    if (Array.size() == 0) return javascript::makeNull();
-    else {
-      ref<value> front = Array.front();
-      Array.erase(Array.begin());
-      return front;
-      }
-    }
-  else if (id == "slice" && parameters.size() == 2) {
-    value_array::const_iterator first = Array.begin() + parameters[0]->toInt();
-    value_array::const_iterator last = Array.begin() + parameters[1]->toInt();
-    
-    auto_ptr<js_array> array(new js_array(first,last));
-    return array.release();
-    }
-  else if (id == "unshift") {
-    TIndex i = 0;
-    FOREACH_CONST(first,parameters,parameter_list) {
-      Array.insert(Array.begin() + i++,(*first)->duplicate());
-      }
-    return javascript::makeConstant(Array.size());
-    }
-  else if (id == "join" && parameters.size() == 1) {
-    string sep = parameters[0]->toString();
-    string result;
-
-    for( TIndex i = 0; i < Array.size(); ++i ) {
-      if (i != 0)
-	result += sep;
-
-      result += Array[i]->toString();
-      }
-
-    return javascript::makeValue(result);
-    }
-  // *** FIXME: implement splice and sort
-  
-  EXJS_THROWINFO(ECJS_UNKNOWN_IDENTIFIER,("Array."+id).c_str())
-  }
-
-
-
-
-void js_array::resize(TSize size) {
-  if (size >= Array.size()) {
-    TSize prevsize = Array.size();
-    
-    Array.resize(size);
-    
-    ref<value> null = javascript::makeNull();
-    for (TIndex i = prevsize;i < size;i++)
-      Array[i] = makeLValue(null);
-    }
-  }
-
-
-
-
-ref<value> &js_array::operator[](TIndex idx) {
-  if (idx >= Array.size())
-    resize((Array.size()+1)*2);
-    
-  return Array[idx];
-  }
-
-
-
-
-
-void js_array::push_back(ref<value> val) {
-  Array.push_back(val);
-  }
-
-
-
-
-// js_array_constructor -------------------------------------------------------
-ref<javascript::value> js_array_constructor::duplicate() {
-  // array_constructor is not mutable
-  return this;
-  }
-
-
-
-
-ref<javascript::value> 
-js_array_constructor::
-construct(parameter_list const &parameters) {
-  if (parameters.size() == 0) return makeArray();
-  else if (parameters.size() == 1) return makeArray(parameters[0]->toInt());
-  else /* parameters.size() >= 2 */ {
-    auto_ptr<js_array> result(new js_array(parameters.size()));
-    
-    TIndex i = 0;
-    FOREACH_CONST(first,parameters,parameter_list) {
-      (*result)[i++] = (*first)->duplicate();
-      }
-    return result.release();
-    }
-  }

simgear/interpreter/js_declaration.cc

@@ -1,216 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : Javascript interpreter
-// ----------------------------------------------------------------------------
-//  (c) Copyright 2000 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#include <ixlib_js_internals.hh>
-#include <ixlib_token_javascript.hh>
-
-
-
-
-#define EXJS_ADD_CODE_LOCATION \
-  catch (no_location_javascript_exception &half) { \
-    throw javascript_exception(half,getCodeLocation()); \
-    }
-
-
-
-
-using namespace ixion;
-using namespace javascript;
-
-
-
-
-// variable_declaration -------------------------------------------------------
-variable_declaration::variable_declaration(string const &id,ref<expression> def_value,code_location const &loc)
-  : expression(loc),Identifier(id),DefaultValue(def_value) {
-  }
-
-
-
-
-ref<value> variable_declaration::evaluate(context const &ctx) const {
-  try {
-    ref<value> def;
-    if (DefaultValue.get() != NULL) def = DefaultValue->evaluate(ctx)->eliminateWrappers()->duplicate();
-    else def = makeNull();
-    
-    ref<value> lv = makeLValue(def);
-    ctx.DeclarationScope->addMember(Identifier,lv);
-    return lv;
-    }
-  EXJS_ADD_CODE_LOCATION
-  }
-
-
-
-
-// constant_declaration -------------------------------------------------------
-constant_declaration::constant_declaration(string const &id,ref<expression> def_value,code_location const &loc)
-  : expression(loc),Identifier(id),DefaultValue(def_value) {
-  }
-
-
-
-
-ref<value> constant_declaration::evaluate(context const &ctx) const {
-  try {
-    ref<value> def;
-    if (DefaultValue.get() != NULL) def = DefaultValue->evaluate(ctx)->eliminateWrappers()->duplicate();
-    else def = makeNull();
-    
-    ref<value> cns = wrapConstant(def);
-    ctx.DeclarationScope->addMember(Identifier,cns);
-    return cns;
-    }
-  EXJS_ADD_CODE_LOCATION
-  }
-
-
-
-
-// function_declaration -------------------------------------------------------
-function_declaration::
-function_declaration(string const &id,parameter_name_list const &pnames,
-ref<expression> body,code_location const &loc)
-  : expression(loc),Identifier(id),ParameterNameList(pnames),Body(body) {
-  }
-
-
-
-
-ref<value> function_declaration::evaluate(context const &ctx) const {
-  try {
-    ref<value> fun = new function(ParameterNameList,Body,ctx.LookupScope);
-    ctx.DeclarationScope->addMember(Identifier,fun);
-    return ref<value>(NULL);
-    }
-  EXJS_ADD_CODE_LOCATION
-  }
-
-
-
-
-// method_declaration ---------------------------------------------------------
-method_declaration::
-method_declaration(string const &id,parameter_name_list const &pnames,
-ref<expression> body,code_location const &loc)
-  : expression(loc),Identifier(id),ParameterNameList(pnames),Body(body) {
-  }
-
-
-
-
-ref<value> method_declaration::evaluate(context const &ctx) const {
-  try {
-    ref<value> fun = new method(ParameterNameList,Body,ctx.LookupScope);
-    ctx.DeclarationScope->addMember(Identifier,fun);
-    return ref<value>(NULL);
-    }
-  EXJS_ADD_CODE_LOCATION
-  }
-
-
-
-
-// constructor_declaration ---------------------------------------------------------
-constructor_declaration::
-constructor_declaration(parameter_name_list const &pnames,
-ref<expression> body,code_location const &loc)
-  : expression(loc),ParameterNameList(pnames),Body(body) {
-  }
-
-
-
-
-ref<value> constructor_declaration::evaluate(context const &ctx) const {
-  try {
-    ref<value> fun = new constructor(ParameterNameList,Body,ctx.LookupScope);
-    return fun;
-    }
-  EXJS_ADD_CODE_LOCATION
-  }
-
-
-
-
-// js_class_declaration -------------------------------------------------------
-js_class_declaration::js_class_declaration(string const &id,ref<expression> superclass,code_location const &loc) 
-  : expression(loc),Identifier(id),SuperClass(superclass) {
-  }
-
-
-
-
-ref<value> js_class_declaration::evaluate(context const &ctx) const {
-  try {
-    ref<list_scope,value> sml(new list_scope);
-    ref<list_scope,value> ml(new list_scope);
-    ref<list_scope,value> svl(new list_scope);
-  
-    ref<value> sc;
-    if (SuperClass.get())
-      sc = SuperClass->evaluate(ctx);
-    
-    ref<value> constructor;
-    if (ConstructorDeclaration.get())
-      constructor = ConstructorDeclaration->evaluate(ctx);
-    ref<value> cls(new js_class(ctx.LookupScope,sc,constructor,sml,ml,svl,VariableList));
-  
-    ref<list_scope,value> static_scope(new list_scope);
-    static_scope->unite(ctx.LookupScope);
-    static_scope->unite(cls);
-    
-    FOREACH_CONST(first,StaticMethodList,declaration_list)
-      (*first)->evaluate(context(sml,static_scope));
-    FOREACH_CONST(first,MethodList,declaration_list)
-      (*first)->evaluate(context(ml,ctx.LookupScope));
-    FOREACH_CONST(first,StaticVariableList,declaration_list)
-      (*first)->evaluate(context(svl,static_scope));
-  
-    ctx.DeclarationScope->addMember(Identifier,cls);
-    return cls;
-    }
-  EXJS_ADD_CODE_LOCATION
-  }
-
-
-
-
-void js_class_declaration::setConstructor(ref<expression> decl) {
-  ConstructorDeclaration = decl;
-  }
-
-
-
-
-void js_class_declaration::addStaticMethod(ref<expression> decl) {
-  StaticMethodList.push_back(decl);
-  }
-
-
-
-
-void js_class_declaration::addMethod(ref<expression> decl) {
-  MethodList.push_back(decl);
-  }
-
-
-
-
-void js_class_declaration::addStaticVariable(ref<expression> decl) {
-  StaticVariableList.push_back(decl);
-  }
-
-
-
-
-void js_class_declaration::addVariable(ref<expression> decl) {
-  VariableList.push_back(decl);
-  }

simgear/interpreter/js_expression.cc

@@ -1,310 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : Javascript interpreter
-// ----------------------------------------------------------------------------
-//  (c) Copyright 2000 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#include <ixlib_js_internals.hh>
-#include <ixlib_token_javascript.hh>
-
-
-
-
-#define EXJS_ADD_CODE_LOCATION \
-  catch (no_location_javascript_exception &half) { \
-    throw javascript_exception(half,getCodeLocation()); \
-    }
-
-
-
-
-using namespace ixion;
-using namespace javascript;
-
-
-
-
-// expression -----------------------------------------------------------------
-expression::expression(code_location const &loc)
-  : Location(loc) {
-  }
-
-
-
-
-expression::~expression() {
-  }
-
-
-
-
-// constant -------------------------------------------------------------------
-constant::constant(ref<value> val,code_location const &loc) 
-  : expression(loc),Value(val) {
-  }
-
-
-
-
-ref<value> 
-constant::
-evaluate(context const &ctx) const {
-  return Value;
-  }
-
-
-
-
-// unary_operator -------------------------------------------------
-unary_operator::unary_operator(value::operator_id opt,ref<expression> opn,code_location const &loc)
-  : expression(loc),Operator(opt),Operand(opn) {
-  }
-
-
-
-
-ref<value> 
-unary_operator::
-evaluate(context const &ctx) const {
-  try {
-    return Operand->evaluate(ctx)->operatorUnary(Operator);
-    }
-  EXJS_ADD_CODE_LOCATION
-  }
-
-
-
-
-// modifying_unary_operator ---------------------------------------------------
-modifying_unary_operator::
-modifying_unary_operator(value::operator_id opt,ref<expression> opn,code_location const &loc)
-  : expression(loc),Operator(opt),Operand(opn) {
-  }
-
-
-
-
-ref<value> 
-modifying_unary_operator::
-evaluate(context const &ctx) const {
-  try {
-    return Operand->evaluate(ctx)->operatorUnaryModifying(Operator);
-    }
-  EXJS_ADD_CODE_LOCATION    
-  }
-
-
-
-
-// binary_operator ------------------------------------------------------------
-binary_operator::binary_operator(value::operator_id opt,ref<expression> opn1,ref<expression> opn2,code_location const &loc)
-  : expression(loc),Operator(opt),Operand1(opn1),Operand2(opn2) {
-  }
-
-
-
-  
-ref<value> binary_operator::evaluate(context const &ctx) const {
-  try {
-    return Operand1->evaluate(ctx)->operatorBinary(Operator,Operand2->evaluate(ctx));
-    }
-  EXJS_ADD_CODE_LOCATION
-  }
-
-
-
-
-// binary_shortcut_operator ---------------------------------------------------
-binary_shortcut_operator::binary_shortcut_operator(value::operator_id opt,ref<expression> opn1,ref<expression> opn2,code_location const &loc)
-  : expression(loc),Operator(opt),Operand1(opn1),Operand2(opn2) {
-  }
-
-
-
-  
-ref<value> binary_shortcut_operator::evaluate(context const &ctx) const {
-  try {
-    return Operand1->evaluate(ctx)->operatorBinaryShortcut(Operator,*Operand2,ctx);
-    }
-  EXJS_ADD_CODE_LOCATION
-  }
-
-
-
-
-// modifying_binary_operator --------------------------------------
-modifying_binary_operator::
-modifying_binary_operator(value::operator_id opt,ref<expression> opn1,ref<expression> opn2,code_location const &loc)
-  : expression(loc),Operator(opt),Operand1(opn1),Operand2(opn2) {
-  }
-
-
-
-  
-ref<value> 
-modifying_binary_operator::
-evaluate(context const &ctx) const {
-  try {
-    return Operand1->evaluate(ctx)->operatorBinaryModifying(Operator,Operand2->evaluate(ctx));
-    }
-  EXJS_ADD_CODE_LOCATION
-  }
-
-
-
-
-// ternary_operator -----------------------------------------------------------
-ternary_operator::
-ternary_operator(ref<expression> opn1,ref<expression> opn2,ref<expression> opn3,code_location const &loc)
-  : expression(loc),Operand1(opn1),Operand2(opn2),Operand3(opn3) {
-  }
-
-
-
-
-ref<value> 
-ternary_operator::
-evaluate(context const &ctx) const {
-  try {
-    if (Operand1->evaluate(ctx)->toBoolean())
-      return Operand2->evaluate(ctx);
-    else
-      return Operand3->evaluate(ctx);
-    }
-  EXJS_ADD_CODE_LOCATION
-  }
-
-
-
-
-// subscript_operation --------------------------------------------------------
-subscript_operation::subscript_operation(ref<expression> opn1,ref<expression> opn2,code_location const &loc)
-  : expression(loc),Operand1(opn1),Operand2(opn2) {
-  }
-
-
-
-  
-ref<value> subscript_operation::evaluate(context const &ctx) const {
-  try {
-    ref<value> op2 = Operand2->evaluate(ctx);
-    return Operand1->evaluate(ctx)->subscript(*op2);
-    }
-  EXJS_ADD_CODE_LOCATION
-  }
-
-
-
-
-// lookup_operation -----------------------------------------------------------
-lookup_operation::lookup_operation(string const &id,code_location const &loc)
-  : expression(loc),Identifier(id) {
-  }
-
-
-
-
-lookup_operation::lookup_operation(ref<expression> opn,string const &id,code_location const &loc)
-  : expression(loc),Operand(opn),Identifier(id) {
-  }
-
-
-
-
-ref<value> lookup_operation::evaluate(context const &ctx) const {
-  try {
-    ref<value> scope(ctx.LookupScope);
-    if (Operand.get() != NULL)
-      scope = Operand->evaluate(ctx);
-    return scope->lookup(Identifier);
-    }
-  EXJS_ADD_CODE_LOCATION
-  }
-
-
-
-
-// assignment -----------------------------------------------------------------
-assignment::
-assignment(ref<expression> opn1,ref<expression> opn2,code_location const &loc)
-  : expression(loc),Operand1(opn1),Operand2(opn2) {
-  }
-
-
-
-  
-ref<value> 
-assignment::evaluate(context const &ctx) const {
-  try {
-    return Operand1->evaluate(ctx)->assign(Operand2->evaluate(ctx)->eliminateWrappers()->duplicate());
-    }
-  EXJS_ADD_CODE_LOCATION
-  }
-
-
-
-
-// basic_call -----------------------------------------------------------------
-basic_call::basic_call(parameter_expression_list const &pexps,code_location const &loc) 
-  : expression(loc),ParameterExpressionList(pexps) {
-  }
-
-
-
-
-void basic_call::makeParameterValueList(context const &ctx,parameter_value_list &pvalues) const {
-  FOREACH_CONST(first,ParameterExpressionList,parameter_expression_list) {
-    pvalues.push_back((*first)->evaluate(ctx));
-    }
-  }
-
-
-
-
-// function_call --------------------------------------------------------------
-function_call::function_call(ref<expression> fun,parameter_expression_list const &pexps,code_location const &loc)
-  : super(pexps,loc),Function(fun) {
-  }
-
-
-
-
-ref<value> function_call::evaluate(context const &ctx) const {
-  try {
-    ref<value> func_value = Function->evaluate(ctx);
-    
-    value::parameter_list pvalues;
-    makeParameterValueList(ctx,pvalues);
-    ref<value> result = func_value->call(pvalues);
-    
-    if (result.get() == NULL) return makeNull();
-    else return result;
-    }
-  EXJS_ADD_CODE_LOCATION
-  }
-
-
-
-
-// construction ---------------------------------------------------------------
-construction::construction(ref<expression> cls,parameter_expression_list const &pexps,code_location const &loc)
-  : super(pexps,loc),Class(cls) {
-  }
-
-
-
-
-ref<value> construction::evaluate(context const &ctx) const {
-  try {
-    ref<value> class_value = Class->evaluate(ctx);
-    
-    value::parameter_list pvalues;
-    makeParameterValueList(ctx,pvalues);
-    
-    return class_value->construct(pvalues);
-    }
-  EXJS_ADD_CODE_LOCATION
-  }

simgear/interpreter/js_instruction.cc

@@ -1,413 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : Javascript interpreter
-// ----------------------------------------------------------------------------
-//  (c) Copyright 2000 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-
-#include <ixlib_js_internals.hh>
-#include <ixlib_token_javascript.hh>
-
-
-
-
-using namespace ixion;
-using namespace javascript;
-
-
-
-
-// instruction_list -----------------------------------------------------------
-ref<value> 
-instruction_list::evaluate(context const &ctx) const {
-  ref<value> result;
-  FOREACH_CONST(first,ExpressionList,expression_list)
-    result = (*first)->evaluate(ctx);
-  return result;
-  }
-
-
-
-
-void instruction_list::add(ref<expression> expr) {
-  ExpressionList.push_back(expr);
-  }
-
-
-
-
-// scoped_instruction_list ----------------------------------------
-ref<value> scoped_instruction_list::evaluate(context const &ctx) const {
-  ref<list_scope,value> scope = new list_scope;
-  scope->unite(ctx.LookupScope);
-
-  ref<value> result = instruction_list::evaluate(context(scope));
-  if (result.get()) return result->duplicate();
-  return ref<value>(NULL);
-
-  // ATTENTION: this is a scope cancellation point.
-  }
-
-
-
-
-// js_if ----------------------------------------------------------------------
-js_if::js_if(ref<expression> cond,ref<expression> ifex,ref<expression> ifnotex,code_location const &loc)
-  : expression(loc),Conditional(cond),IfExpression(ifex),IfNotExpression(ifnotex) {
-  }
-
-
-
-
-ref<value> js_if::evaluate(context const &ctx) const {
-  if (Conditional->evaluate(ctx)->toBoolean())
-    return IfExpression->evaluate(ctx);
-  else 
-    if (IfNotExpression.get()) 
-      return IfNotExpression->evaluate(ctx);
-    else 
-      return ref<value>(NULL);
-  }
-
-
-
-
-// js_while -------------------------------------------------------------------
-js_while::js_while(ref<expression> cond,ref<expression> loopex,code_location const &loc)
-  : expression(loc),Conditional(cond),LoopExpression(loopex),HasLabel(false) {
-  }
-
-
-
-
-js_while::js_while(ref<expression> cond,ref<expression> loopex,string const &label,code_location const &loc)
-  : expression(loc),Conditional(cond),LoopExpression(loopex),HasLabel(true),Label(label) {
-  }
-
-
-
-
-ref<value> js_while::evaluate(context const &ctx) const {
-  ref<value> result;
-  while (Conditional->evaluate(ctx)->toBoolean()) {
-    try {
-      result = LoopExpression->evaluate(ctx);
-      }
-    catch (break_exception &be) {
-      if (!be.HasLabel || (HasLabel && be.HasLabel && be.Label == Label))
-        break;
-      else throw;
-      }
-    catch (continue_exception &ce) {
-      if (!ce.HasLabel || (HasLabel && ce.HasLabel && ce.Label == Label))
-        continue;
-      else throw;
-      }
-    }
-  return result;
-  }
-
-
-
-
-// js_do_while ----------------------------------------------------------------
-js_do_while::js_do_while(ref<expression> cond,ref<expression> loopex,code_location const &loc)
-  : expression(loc),Conditional(cond),LoopExpression(loopex),HasLabel(false) {
-  }
-
-
-
-
-js_do_while::js_do_while(ref<expression> cond,ref<expression> loopex,string const &label,code_location const &loc)
-  : expression(loc),Conditional(cond),LoopExpression(loopex),HasLabel(true),Label(label) {
-  }
-
-
-
-
-ref<value> js_do_while::evaluate(context const &ctx) const {
-  ref<value> result;
-  do {
-    try {
-      result = LoopExpression->evaluate(ctx);
-      }
-    catch (break_exception &be) {
-      if (!be.HasLabel || (HasLabel && be.HasLabel && be.Label == Label))
-        break;
-      else throw;
-      }
-    catch (continue_exception &ce) {
-      if (!ce.HasLabel || (HasLabel && ce.HasLabel && ce.Label == Label))
-        continue;
-      else throw;
-      }
-  } while (Conditional->evaluate(ctx)->toBoolean());
-  return result;
-  }
-
-
-
-
-// js_for ---------------------------------------------------------------------
-js_for::js_for(ref<expression> init,ref<expression> cond,ref<expression> update,ref<expression> loop,code_location const &loc)
-  : expression(loc),Initialization(init),Conditional(cond),Update(update),
-  LoopExpression(loop),HasLabel(false) {
-  }
-
-
-
-
-js_for::js_for(ref<expression> init,ref<expression> cond,ref<expression> update,ref<expression> loop,string const &label,code_location const &loc)
-  : expression(loc),Initialization(init),Conditional(cond),Update(update),LoopExpression(loop),
-  HasLabel(true),Label(label) {
-  }
-
-
-
-
-ref<value> js_for::evaluate(context const &ctx) const {
-  ref<list_scope,value> scope = new list_scope;
-  scope->unite(ctx.LookupScope);
-  context inner_context(scope);
-
-  ref<value> result;
-  for (Initialization->evaluate(inner_context);Conditional->evaluate(inner_context)->toBoolean();
-  Update->evaluate(inner_context)) {
-    try {
-      result = LoopExpression->evaluate(inner_context);
-      }
-    catch (break_exception &be) {
-      if (!be.HasLabel || (HasLabel && be.HasLabel && be.Label == Label))
-        break;
-      else throw;
-      }
-    catch (continue_exception &ce) {
-      if (!ce.HasLabel || (HasLabel && ce.HasLabel && ce.Label == Label))
-        continue;
-      else throw;
-      }
-    }
-  return result;
-  }
-
-
-
-
-// js_for_in ------------------------------------------------------------------
-js_for_in::js_for_in(ref<expression> iter,ref<expression> array,ref<expression> loop,code_location const &loc)
-  : expression(loc),Iterator(iter),Array(array),LoopExpression(loop),HasLabel(false) {
-  }
-
-
-
-
-js_for_in::js_for_in(ref<expression> iter,ref<expression> array,ref<expression> loop,string const &label,code_location const &loc)
-  : expression(loc),Iterator(iter),Array(array),LoopExpression(loop),
-  HasLabel(true),Label(label) {
-  }
-
-
-
-
-ref<value> js_for_in::evaluate(context const &ctx) const {
-  ref<list_scope,value> scope = new list_scope;
-  scope->unite(ctx.LookupScope);
-  context inner_context(scope);
-
-  ref<value> result;
-  ref<value> iterator = Iterator->evaluate(inner_context);
-  ref<value> array = Array->evaluate(inner_context);
-  
-  TSize size = array->lookup("length")->toInt();
-  
-  for (TIndex i = 0;i < size;i++) {
-    try {
-      iterator->assign(array->subscript(*makeConstant(i)));
-      result = LoopExpression->evaluate(inner_context);
-      }
-    catch (break_exception &be) {
-      if (!be.HasLabel || (HasLabel && be.HasLabel && be.Label == Label))
-        break;
-      else throw;
-      }
-    catch (continue_exception &ce) {
-      if (!ce.HasLabel || (HasLabel && ce.HasLabel && ce.Label == Label))
-        continue;
-      else throw;
-      }
-    }
-  if (result.get()) return result->duplicate();
-  return ref<value>(NULL);
-
-  // ATTENTION: this is a scope cancellation point.
-  }
-
-
-
-
-// js_return ------------------------------------------------------------------
-js_return::js_return(ref<expression> retval,code_location const &loc)
-  : expression(loc),ReturnValue(retval) {
-  }
-
-
-
-
-ref<value> js_return::evaluate(context const &ctx) const {
-  ref<value> retval;
-  if (ReturnValue.get())
-    retval = ReturnValue->evaluate(ctx);
-
-  throw return_exception(retval,getCodeLocation());
-  }
-
-
-
-
-// js_break -------------------------------------------------------------------
-js_break::js_break(code_location const &loc)
-  : expression(loc),HasLabel(false) {
-  }
-
-
-
-
-js_break::js_break(string const &label,code_location const &loc)
-  : expression(loc),HasLabel(true),Label(label) {
-  }
-
-
-
-
-ref<value> js_break::evaluate(context const &ctx) const {
-  throw break_exception(HasLabel,Label,getCodeLocation());
-  }
-
-
-
-
-// js_continue ----------------------------------------------------------------
-js_continue::js_continue(code_location const &loc)
-  : expression(loc),HasLabel(false) {
-  }
-
-
-
-
-js_continue::js_continue(string const &label,code_location const &loc)
-  : expression(loc),HasLabel(true),Label(label) {
-  }
-
-
-
-
-ref<value> js_continue::evaluate(context const &ctx) const {
-  throw continue_exception(HasLabel,Label,getCodeLocation());
-  }
-
-
-
-
-// break_label ----------------------------------------------------------------
-break_label::break_label(string const &label,ref<expression> expr,code_location const &loc)
-  : expression(loc),Label(label),Expression(expr) {
-  }
-
-
-
-
-ref<value> 
-break_label::evaluate(context const &ctx) const {
-  try {
-    return Expression->evaluate(ctx);
-    }
-  catch (break_exception &be) {
-    if (be.HasLabel && be.Label == Label) return ref<value>(NULL);
-    else throw;
-    }
-  }
-
-
-
-
-// js_switch  -----------------------------------------------------------------
-js_switch::js_switch(ref<expression> discriminant,code_location const &loc)
-  : expression(loc),HasLabel(false),Discriminant(discriminant) {
-  }
-
-
-
-
-js_switch::js_switch(ref<expression> discriminant,string const &label,code_location const &loc)
-  : expression(loc),HasLabel(true),Label(label),Discriminant(discriminant) {
-  }
-
-
-
-
-ref<value> 
-js_switch::
-evaluate(context const &ctx) const {
-  ref<list_scope,value> scope = new list_scope;
-  scope->unite(ctx.LookupScope);
-  context inner_context(scope);
-  
-  ref<value> discr = Discriminant->evaluate(inner_context);
-  
-  case_list::const_iterator expr,def;
-  bool expr_found = false,def_found = false;
-  FOREACH_CONST(first,CaseList,case_list) {
-    if (first->DiscriminantValue.get()) {
-      if (first->DiscriminantValue->evaluate(inner_context)->
-      operatorBinary(value::OP_EQUAL,Discriminant->evaluate(inner_context))->toBoolean()) {
-        expr = first;
-	expr_found = true;
-	break;
-	}
-      }
-    else {
-      if (!def_found) {
-        def = first;
-        def_found = true;
-	}
-      }
-    }
-  
-  try {
-    case_list::const_iterator exec,last = CaseList.end();
-    if (expr_found)
-      exec = expr; 
-    else if (def_found) 
-      exec = def;
-    else
-      return ref<value>(NULL);
-
-    ref<value> result;
-    while (exec != last) {
-      result = exec->Expression->evaluate(inner_context);
-      exec++;
-      }
-    if (result.get()) return result->duplicate();
-    return ref<value>(NULL);
-    }
-  catch (break_exception &be) {
-    if (!be.HasLabel || (HasLabel && be.HasLabel && be.Label == Label)) 
-      return ref<value>(NULL);
-    else 
-      throw;
-    }
-  
-  // ATTENTION: this is a scope cancellation point.
-  }
-
-
-
-
-void js_switch::addCase(ref<expression> dvalue,ref<expression> expr) {
-  case_label cl;
-  cl.DiscriminantValue = dvalue;
-  cl.Expression = expr;
-  CaseList.push_back(cl);
-  }

simgear/interpreter/js_library.cc

@@ -1,259 +0,0 @@
-// ----------------------------------------------------------------------------
-//  Description      : Javascript interpreter library
-// ----------------------------------------------------------------------------
-//  (c) Copyright 2000 by iXiONmedia, all rights reserved.
-// ----------------------------------------------------------------------------
-
-
-
-#include <cmath>
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <ixlib_js_internals.hh>
-#include <ixlib_numconv.hh>
-#include <ixlib_random.hh>
-
-
-
-
-using namespace ixion;
-using namespace javascript;
-
-
-
-
-namespace {
-  class eval : public value {
-    protected:
-      interpreter	&Interpreter;
-    
-    public:
-      value_type getType() const { 
-        return VT_FUNCTION; 
-        } 
-      eval(interpreter &interpreter)
-        : Interpreter(interpreter) {
-	}
-      ref<value> call(parameter_list const &parameters);
-    };
-    
-  class Math : public value_with_methods {
-    private:
-      typedef value_with_methods super;
-
-    protected:
-      float_random	RNG;
-      
-    public:
-      value_type getType() const {
-        return VT_BUILTIN;
-	}
-      
-      ref<value> duplicate() const;
-
-      ref<value> lookup(string const &identifier);
-      ref<value> callMethod(string const &identifier,parameter_list const &parameters);
-    };
-  }
-  
-
-
-
-// eval -----------------------------------------------------------------------
-ref<value> 
-eval::
-call(parameter_list const &parameters) {
-  if (parameters.size() != 1) {
-    EXJS_THROWINFO(ECJS_INVALID_NUMBER_OF_ARGUMENTS,"eval")
-    }
-  if (parameters[0]->getType() != VT_STRING) return parameters[0];
-  return Interpreter.execute(parameters[0]->toString());
-  }
-
-
-
-
-// parseInt -------------------------------------------------------------------
-IXLIB_JS_DECLARE_FUNCTION(parseInt) {
-  if (parameters.size() != 1 && parameters.size() != 2) {
-    EXJS_THROWINFO(ECJS_INVALID_NUMBER_OF_ARGUMENTS,"parseInt")
-    }
-  unsigned radix = 10;
-  if (parameters.size() == 2)
-    radix = parameters[1]->toInt();
-  return makeConstant(evalSigned(parameters[0]->toString(),radix));
-  }
-
-
-
-
-// parseFloat -----------------------------------------------------------------
-IXLIB_JS_DECLARE_FUNCTION(parseFloat) {
-  if (parameters.size() != 1) {
-    EXJS_THROWINFO(ECJS_INVALID_NUMBER_OF_ARGUMENTS,"parseFloat")
-    }
-  return makeConstant(evalFloat(parameters[0]->toString()));
-  }
-
-
-
-
-// isNaN ----------------------------------------------------------------------
-#ifdef ADVANCED_MATH_AVAILABLE
-IXLIB_JS_DECLARE_FUNCTION(isNaN) {
-  if (parameters.size() != 1) {
-    EXJS_THROWINFO(ECJS_INVALID_NUMBER_OF_ARGUMENTS,"isNaN")
-    }
-  int classification = fpclassify(parameters[0]->toFloat());
-  return makeConstant(classification == FP_NAN);
-  }
-#endif
-
-
-
-
-// isFinite -------------------------------------------------------------------
-#ifdef ADVANCED_MATH_AVAILABLE
-IXLIB_JS_DECLARE_FUNCTION(isFinite) {
-  if (parameters.size() != 1) {
-    EXJS_THROWINFO(ECJS_INVALID_NUMBER_OF_ARGUMENTS,"isFinite")
-    }
-  int classification = fpclassify(parameters[0]->toFloat());
-  return makeConstant(classification != FP_NAN && classification != FP_INFINITE);
-  }
-#endif
-
-
-
-
-// Math -----------------------------------------------------------------------
-ref<value> Math::duplicate() const {
-  // Math is not mutable
-  return const_cast<Math *>(this);
-  }
-
-
-
-
-ref<value> Math::lookup(string const &identifier) {
-  #define MATH_CONSTANT(NAME,VALUE) \
-    if (identifier == NAME) return makeConstant(VALUE);
-  
-  MATH_CONSTANT("E",2.7182818284590452354)
-  MATH_CONSTANT("LN10",2.30258509299404568402)
-  MATH_CONSTANT("LN2",0.69314718055994530942)
-  MATH_CONSTANT("LOG2E",1.4426950408889634074)  
-  MATH_CONSTANT("LOG10E,",0.43429448190325182765)
-  MATH_CONSTANT("PI",3.14159265358979323846)
-  MATH_CONSTANT("SQRT1_2",0.70710678118654752440)
-  MATH_CONSTANT("SQRT2",1.41421356237309504880)
-
-  return super::lookup(identifier);
-  }
-
-
-
-
-ref<value> Math::callMethod(string const &identifier,parameter_list const &parameters) {
-  #define MATH_FUNCTION(NAME,C_NAME) \
-    if (identifier == NAME) { \
-      if (parameters.size() != 1) { \
-        EXJS_THROWINFO(ECJS_INVALID_NUMBER_OF_ARGUMENTS,"Math." NAME) \
-        } \
-      return makeConstant(C_NAME(parameters[0]->toFloat())); \
-      }
-  
-  MATH_FUNCTION("abs",NUM_ABS)
-  MATH_FUNCTION("acos",acos)
-  MATH_FUNCTION("asin",asin)
-  MATH_FUNCTION("atan",atan)
-  MATH_FUNCTION("ceil",ceil)
-  MATH_FUNCTION("cos",cos)
-  MATH_FUNCTION("exp",exp)
-  MATH_FUNCTION("floor",floor)
-  MATH_FUNCTION("log",log)
-  #ifdef ADVANCED_MATH_AVAILABLE
-  MATH_FUNCTION("round",round)
-  #endif
-  MATH_FUNCTION("sin",sin)
-  MATH_FUNCTION("sqrt",sqrt)
-  MATH_FUNCTION("tan",tan)
-  if (identifier == "atan2") {
-    if (parameters.size() != 2) {
-      EXJS_THROWINFO(ECJS_INVALID_NUMBER_OF_ARGUMENTS,"Math.atan2")
-      }
-    return makeConstant(atan2(parameters[0]->toFloat(),parameters[1]->toFloat()));
-    }
-  if (identifier == "pow") {
-    if (parameters.size() != 2) {
-      EXJS_THROWINFO(ECJS_INVALID_NUMBER_OF_ARGUMENTS,"Math.pow")
-      }
-    return makeConstant(pow(parameters[0]->toFloat(),parameters[1]->toFloat()));
-    }
-  if (identifier == "random") {
-    if (parameters.size() != 0) {
-      EXJS_THROWINFO(ECJS_INVALID_NUMBER_OF_ARGUMENTS,"Math.random")
-      }
-    return makeConstant(RNG());
-    }
-  // *** FIXME this is non-compliant, but there is no equivalent standard function
-  if (identifier == "initRandom") {
-    if (parameters.size() >= 2) {
-      EXJS_THROWINFO(ECJS_INVALID_NUMBER_OF_ARGUMENTS,"Math.initRandom")
-      }
-    if (parameters.size() == 0)
-      RNG.init();
-    else if (parameters.size() == 1)
-      RNG.init(parameters[0]->toFloat());
-    return makeNull();
-    }
-  
-  // *** FIXME: implement max, min
-  EXJS_THROWINFO(ECJS_UNKNOWN_IDENTIFIER,("Math." + identifier).c_str())
-  }
-
-
-
-
-// external interface functions -----------------------------------------------
-#define ADD_GLOBAL_OBJECT(NAME,TYPE) \
-  { ref<value> x = new TYPE(); \
-    ip.RootScope->addMember(NAME,x); \
-    }
-  
-
-
-
-void javascript::addGlobal(interpreter &ip) {
-  ref<value> ev = new eval(ip);
-  ip.RootScope->addMember("eval",ev);
-
-  ADD_GLOBAL_OBJECT("parseInt",parseInt)
-  ADD_GLOBAL_OBJECT("parseFloat",parseFloat)
-  #ifdef ADVANCED_MATH_AVAILABLE
-  ADD_GLOBAL_OBJECT("isNaN",isNaN)
-  ADD_GLOBAL_OBJECT("isFinite",isFinite)
-  #endif
-  
-  // *** FIXME hope this is portable
-  float zero = 0;
-  ip.RootScope->addMember("NaN",makeConstant(0.0/zero));
-  ip.RootScope->addMember("Infinity",makeConstant(1.0/zero));
-  ip.RootScope->addMember("undefined",makeUndefined());
-  }
-
-
-
-
-void javascript::addMath(interpreter &ip) {
-  ADD_GLOBAL_OBJECT("Math",Math)
-  }
-
-
-
-
-void javascript::addStandardLibrary(interpreter &ip) {
-  addGlobal(ip);
-  addMath(ip);
-  }

simgear/interpreter/lex.javascript.yy

@@ -1,168 +0,0 @@
-/* -------- definitions ------- */
-
-%option c++ yylineno noyywrap prefix="js" outfile="lex.javascript.cc" batch
-
-%{
-#include <ixlib_js_internals.hh>
-#include <ixlib_token_javascript.hh>
-
-using namespace ixion;
-using namespace javascript;
-%}
-
-WHITESPACE	[ \t\n\r]
-
-DIGIT		[0-9]
-DIGIT_NZ	[1-9]
-DIGIT_OCT	[0-7]
-DIGIT_HEX	[0-9a-fA-F]
-DIGIT_SEQ	{DIGIT}+
-
-NONDIGIT	[_a-zA-Z]
-ID_COMPONENT	[_a-zA-Z0-9]
-
-ESCAPE_SIMPLE	\\['"?\\abfnrtv]
-ESCAPE_OCTAL	\\{DIGIT_OCT}{1,3}
-ESCAPE_HEX	\\x{DIGIT_HEX}{1,2}
-ESCAPE		{ESCAPE_SIMPLE}|{ESCAPE_OCTAL}|{ESCAPE_HEX}
-S_CHAR		[^"\\\n]|{ESCAPE}
-
-SIGN		\+|\-
-SIGNopt		{SIGN}?
-
-
-
-
-/* higher-level entities ------------------------------------------------------
-*/
-IDENTIFIER	{NONDIGIT}{ID_COMPONENT}*
-
-
-
-
-/* literals -------------------------------------------------------------------
-*/
-LIT_DECIMAL	{DIGIT_NZ}{DIGIT}*
-LIT_OCTAL	0{DIGIT_OCT}*
-LIT_HEX		0[xX]{DIGIT_HEX}+
-LIT_INT		({LIT_DECIMAL}|{LIT_OCTAL}|{LIT_HEX})
-
-LIT_STRING	\"{S_CHAR}*\"|\'{S_CHAR}*\'
-
-LIT_FRACTION	{DIGIT_SEQ}?\.{DIGIT_SEQ}|{DIGIT_SEQ}\.
-LIT_EXPONENT	[eE]{SIGNopt}{DIGIT_SEQ}
-LIT_FLOAT	{LIT_FRACTION}{LIT_EXPONENT}?|{DIGIT_SEQ}{LIT_EXPONENT}
-
-
-
-
-
-
-/* Contexts -------------------------------------------------------------------
-*/
-
-%x Comment
-%x LineComment
-
-
-
-
-/* Rules ----------------------------------------------------------------------
-*/
-%% 
-
-\/\*			BEGIN(Comment);
-<Comment>\*\/		BEGIN(INITIAL);
-<Comment><<EOF>>	EXJS_THROW(ECJS_UNTERMINATED_COMMENT)
-<Comment>.		/* nothing */
-<Comment>\n		/* nothing */
-\/\/			BEGIN(LineComment);
-<LineComment>[\n\r]+	BEGIN(INITIAL);
-<LineComment>.		/* nothing */
-
-<<EOF>>    		return TT_EOF;
-
-\{			return '{';
-\}			return '}';
-\;			return ';';
-
-\[			return '[';
-\]			return ']';
-\(			return '(';
-\)			return ')';
-\?			return '?';
-\:			return ':';
-\+			return '+';
-\-			return '-';
-\*			return '*';
-\/			return '/';
-\%			return '%';
-\^			return '^';
-\&			return '&';
-\|			return '|';
-\~			return '~';
-\!			return '!';
-\=			return '=';
-\<			return '<';
-\>			return '>';
-\,			return ',';
-\.			return '.';
-\+\=			return TT_JS_PLUS_ASSIGN;
-\-\=			return TT_JS_MINUS_ASSIGN;
-\*\=			return TT_JS_MULTIPLY_ASSIGN;
-\/\=			return TT_JS_DIVIDE_ASSIGN;
-\%\=			return TT_JS_MODULO_ASSIGN;
-\^\=			return TT_JS_BIT_XOR_ASSIGN;
-\&\=			return TT_JS_BIT_AND_ASSIGN;
-\|\=			return TT_JS_BIT_OR_ASSIGN;
-\<\<			return TT_JS_LEFT_SHIFT;
-\>\>			return TT_JS_RIGHT_SHIFT;
-\<\<\=			return TT_JS_LEFT_SHIFT_ASSIGN;
-\>\>\=			return TT_JS_RIGHT_SHIFT_ASSIGN;
-\=\=\=			return TT_JS_IDENTICAL;
-\!\=\=			return TT_JS_NOT_IDENTICAL;
-\=\=			return TT_JS_EQUAL;
-\!\=			return TT_JS_NOT_EQUAL;
-\<\=			return TT_JS_LESS_EQUAL;
-\>\=			return TT_JS_GREATER_EQUAL;
-\&\&			return TT_JS_LOGICAL_AND;
-\|\|			return TT_JS_LOGICAL_OR;
-\+\+			return TT_JS_INCREMENT;
-\-\-			return TT_JS_DECREMENT;
-
-new			return TT_JS_NEW;
-
-this			return TT_JS_THIS;
-function		return TT_JS_FUNCTION;
-var			return TT_JS_VAR;
-null			return TT_JS_NULL;
-if			return TT_JS_IF;
-while			return TT_JS_WHILE;
-do			return TT_JS_DO;
-else			return TT_JS_ELSE;
-for			return TT_JS_FOR;
-return			return TT_JS_RETURN;
-switch			return TT_JS_SWITCH;
-case			return TT_JS_CASE;
-continue		return TT_JS_CONTINUE;
-break			return TT_JS_BREAK;
-default			return TT_JS_DEFAULT;
-true			return TT_JS_LIT_TRUE;
-false			return TT_JS_LIT_FALSE;
-undefined		return TT_JS_LIT_UNDEFINED;
-in			return TT_JS_IN;
-const			return TT_JS_CONST;
-class			return TT_JS_CLASS;
-extends			return TT_JS_EXTENDS;
-namespace		return TT_JS_NAMESPACE;
-static			return TT_JS_STATIC;
-constructor		return TT_JS_CONSTRUCTOR;
-
-{LIT_INT}		return TT_JS_LIT_INT;
-{LIT_FLOAT}		return TT_JS_LIT_FLOAT;
-{LIT_STRING}		return TT_JS_LIT_STRING;
-
-{IDENTIFIER}		return TT_JS_IDENTIFIER;
-
-{WHITESPACE}+		/* nothing */
-.			EXJS_THROWINFOLOCATION(ECJS_INVALID_TOKEN,YYText(),code_location(lineno()))