mirror of
https://github.com/nasa/trick.git
synced 2025-04-05 10:26:47 +00:00
Merge branch 'nasa:master' into HeadlessJavaGUITests-AssertJ_Swing
This commit is contained in:
Mrockwell2
GitHub
commit
c6010829d4
10
.github/workflows/trickops.yml
vendored
10
.github/workflows/trickops.yml
vendored
@ -8,15 +8,15 @@ defaults:
|
||||
|
||||
jobs:
|
||||
trickops-tests-ubuntu:
|
||||
name: Unit Tests Ubuntu:20.04
|
||||
runs-on: ubuntu-20.04
|
||||
container: ubuntu:20.04
|
||||
name: Unit Tests Ubuntu:22.04
|
||||
runs-on: ubuntu-22.04
|
||||
container: ubuntu:22.04
|
||||
steps:
|
||||
- uses: actions/checkout@master
|
||||
- name: install dependencies
|
||||
# Note that perl is for trick-gte which TrickOps runs and qt and everything after it is for koviz
|
||||
run: |
|
||||
export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -y git python3 python3-venv perl perl-modules-5.30 qtbase5-dev wget unzip g++ make flex bison
|
||||
export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -y git python3 python3-venv perl perl-modules-5.34 qtbase5-dev wget unzip g++ make flex bison
|
||||
- name: create virtual environment
|
||||
run: |
|
||||
cd share/trick/trickops/
|
||||
@ -41,7 +41,7 @@ jobs:
|
||||
|
||||
trickops-tests-rockylinux8:
|
||||
name: Unit Tests RockyLinux8
|
||||
runs-on: ubuntu-20.04
|
||||
runs-on: ubuntu-22.04
|
||||
container: rockylinux:8
|
||||
steps:
|
||||
- uses: actions/checkout@master
|
||||
|
||||
@ -16,9 +16,6 @@
|
||||
<a href="https://github.com/nasa/trick/actions?query=workflow%3A32-bit">
|
||||
<img src="https://github.com/nasa/trick/workflows/32-bit/badge.svg?branch=master" alt="32-bit" height=30px>
|
||||
</a>
|
||||
<a href="https://coveralls.io/github/nasa/trick?branch=master">
|
||||
<img src="https://coveralls.io/repos/github/nasa/trick/badge.svg?branch=master" alt="Coverage Status" height=30px>
|
||||
</a>
|
||||
</p>
|
||||
|
||||
|
||||
|
||||
@ -275,10 +275,13 @@ Add the <b>class_string</b> to the SWIG interface text.
|
||||
1. While there's class content text remaining to be processed,
|
||||
repeatedly search for data members that match : <b>template_name '<'</b> <i>template-params</i> <b>'>' name ;</b>
|
||||
For each match, create a SWIG %template directive to create an instantiation
|
||||
of the specific templated type used by the data member. Add the
|
||||
SWIG %template directive to the templated typedefs string that
|
||||
Otherwise append whatever wasn't matched in process contents to
|
||||
the SWIG interface text.
|
||||
of the specific templated type used by the data member. Due to changes in SWIG 4,
|
||||
template directives must be specified before their respective data members. As such,
|
||||
the template directives are inserted immediately prior to the class definition.
|
||||
SWIG does not resolve namespaces in these directives the same as C++ does
|
||||
(it will only check local scope, not global). To account for this,
|
||||
if the directive specifies a template outside the local namespace, convert_swig will
|
||||
escape the current namespace in the format : } template_directive namespace name {
|
||||
|
||||
## process_typedef_struct
|
||||
|
||||
|
||||
@ -190,7 +190,7 @@ apt-get update
|
||||
apt-get install -y bison clang flex git llvm make maven swig cmake \
|
||||
curl g++ libx11-dev libxml2-dev libxt-dev libmotif-common libmotif-dev \
|
||||
python3-dev zlib1g-dev llvm-dev libclang-dev libudunits2-dev \
|
||||
libgtest-dev openjdk-11-jdk zip
|
||||
libgtest-dev default-jdk zip
|
||||
|
||||
# On some versions of Ubuntu (18.04 as of 04/2021), there may be multiple installations of python.
|
||||
# Our new python3-dev will be linked to python3 and python3-config in your bin.
|
||||
@ -198,6 +198,8 @@ libgtest-dev openjdk-11-jdk zip
|
||||
export PYTHON_VERSION=3
|
||||
```
|
||||
|
||||
Note: If you need to use a specific JDK version, such as `openjdk-11-jdk`, you can replace `default-jdk` with `openjdk-11-jdk` under install packages as shown above. However, you need to check where the `java` and `javac` commands are located. For instance, Ubuntu 24 typically sets up JRE (21) headless by default, so the `java` (version 21 headless) command might be located in `/usr/bin`. When you install `openjdk-11-jdk`, both `java` (version 11) and `javac` (version 11) might be placed in `/usr/lib/jvm/java-11-openjdk-amd64/bin`, with only `javac` potentially also in `/usr/bin`. Consequently, running a Java GUI with the default PATH might use JRE 21 headless instead of JRE 11, even though you’re using JDK 11 for compiling, which may not be the desired configuration. Placing `/usr/lib/jvm/java-11-openjdk-amd64/bin` before `/usr/bin` in your PATH ensures that only JDK 11 is used.
|
||||
|
||||
proceed to [Install Trick](#install) section of the install guide
|
||||
|
||||
---
|
||||
@ -348,9 +350,9 @@ proceed to [Install Trick](#install) section of the install guide
|
||||
|
||||
<a name="manual_build_clang_llvm"></a>
|
||||
### Build Clang and LLVM
|
||||
#### If you come to this section because Clang+LLVM installed by the package manager on your machine does not work for your environment, you need to manually build Clang and LLVM. Following instructions show steps on building a particular release of Clang and LLVM . `cmake` is required. CMake may support multiple native build systmes on certain platforms. A generator is responsible for generating a particular build system. Below lists two approaches for your reference. The 1st approach uses `Unix Makefiles` (one of Makefile generators) and the 2nd one uses `Ninja` (one of Ninja generators). For Mac Apple Silicon user, may want to go to the 2nd approach direcly.
|
||||
If you come to this section because Clang+LLVM installed by the package manager on your machine does not work for your environment, you need to manually build Clang and LLVM. Following instructions show steps on building a particular release of Clang and LLVM . `cmake` is required. CMake may support multiple native build systmes on certain platforms. A generator is responsible for generating a particular build system. Below lists two approaches for your reference. The first approach uses `Unix Makefiles` (one of Makefile generators) and the second one uses `Ninja` (one of Ninja generators). For Mac Apple Silicon user, may want to go to the second approach directly.
|
||||
|
||||
#### Note: Remember to add `--with-llvm=<clang+llvm-17_path>` for Trick configure if using the Clang and LLVM built in this section.
|
||||
Note: Remember to add `--with-llvm=<clang+llvm-17_path>` for Trick configure if using the Clang and LLVM built in this section.
|
||||
|
||||
1. Using `Unix Makefiles` generator
|
||||
|
||||
|
||||
@ -148,9 +148,11 @@ Structure and class variables do not carry around units, and therefore the units
|
||||
## Creating New Objects and Allocating Memory
|
||||
|
||||
It is possible to create new objects and allocate new memory for structures directly in the Python
|
||||
input file. There are at least two ways to allocate memory.
|
||||
input file. Three different ways are described below.
|
||||
|
||||
The first method is to call the `Trick::MemoryManager` routines to allocate memory. This is the preferred method.
|
||||
### 1. Call ```Trick::MemoryManager``` Allocation Routines Directly
|
||||
|
||||
The first method is to call the `Trick::MemoryManager` routines to allocate memory.
|
||||
There are 3 `Trick::MemoryManager` calls with varying arguments that can be used to allocate memory
|
||||
|
||||
```python
|
||||
@ -188,7 +190,80 @@ food[2] = trick.alloc_type(6, "double")
|
||||
|
||||
Memory allocated using the above routines are tracked by the memory manager and is checkpointable and data recordable.
|
||||
|
||||
The second method is to call the wrapped constructor of the class directly. This is analogous to declaring local
|
||||
### 2. Use a Factory Function
|
||||
The benefit of this method is flexibility in how objects are initialized. For example, we might want to initialize our objects with a non-default constructor. So, the requirements for our factory function are:
|
||||
|
||||
1. Allocate a memory object via the Trick Memory Manager, and
|
||||
2. Call a constructor to initialize the object (using placement-new)
|
||||
|
||||
#### A Few Words About Placement-new
|
||||
In C++ one often instanciates a class object using the **new** operator, for example:
|
||||
|
||||
```
|
||||
MyClass * p = new MyClass(a,b,c);
|
||||
```
|
||||
|
||||
This form of **new**
|
||||
|
||||
1. allocates memory, and then
|
||||
2. calls a constructor.
|
||||
|
||||
Another form of **new**, is called "placement-new". Rather than allocating and calling a constructor to initialize memory, placement-new simply calls a constructor to initialize memory that has already been allocated (e.g., from the Memory Manager).
|
||||
|
||||
If ```p``` points to allocated memory, then we can initialize that memory with **placement-new** :
|
||||
|
||||
```
|
||||
new (p) MyClass(a,b,c);
|
||||
```
|
||||
|
||||
In our factory function we'll pass the object pointer we got from the Memory Manager to our placement-new call, to initialize it.
|
||||
|
||||
#### Example Factory Function from ```SIM_contact```
|
||||
SIM_contact simulates collisions between moving balls (think "pool balls"). From the input file, one or more balls can be added to the simulation. Each ball is initialized with a mass, a size, a position, and a velocity. The Ball class also includes a (non-default) constructor.
|
||||
|
||||
```C++
|
||||
class Ball {
|
||||
public:
|
||||
Ball(){}
|
||||
double pos[2];
|
||||
double vel[2];
|
||||
double mass;
|
||||
double radius;
|
||||
|
||||
// A Non-Default Constructor
|
||||
Ball(double x, double y, double vx, double vy, double r, double m);
|
||||
};
|
||||
```
|
||||
To create and initialize a new Ball object, we have the function ```make_Ball```.
|
||||
|
||||
```C++
|
||||
// Factory function Implementation
|
||||
Ball* make_Ball(double x, double y, double vx, double vy, double r, double m) {
|
||||
Ball* b = (Ball*)TMM_declare_var_s("Ball");
|
||||
return (new (b) Ball(x,y,vx,vy,r,m));
|
||||
}
|
||||
```
|
||||
|
||||
Because this function is bound to Python by SWIG, it can be called from the input file.
|
||||
For example :
|
||||
|
||||
##### From ```RUN_Newtons_cradle/input.py```
|
||||
```Python
|
||||
dyn.contact.nballs = 7
|
||||
dyn.contact.balls = trick.TMM_declare_var_1d("Ball*", dyn.contact.nballs)
|
||||
dyn.contact.balls[0] = trick.make_Ball(-4.00, 0.0, 2.0, 0.0, 0.5, 1.0)
|
||||
dyn.contact.balls[1] = trick.make_Ball(-1.00, 0.0, 0.0, 0.0, 0.5, 1.0)
|
||||
dyn.contact.balls[2] = trick.make_Ball( 0.01, 0.0, 0.0, 0.0, 0.5, 1.0)
|
||||
dyn.contact.balls[3] = trick.make_Ball( 1.02, 0.0, 0.0, 0.0, 0.5, 1.0)
|
||||
dyn.contact.balls[4] = trick.make_Ball( 2.03, 0.0, 0.0, 0.0, 0.5, 1.0)
|
||||
dyn.contact.balls[5] = trick.make_Ball( 7.00, 0.0, 0.0, 0.0, 1.0, 1000000.0)
|
||||
dyn.contact.balls[6] = trick.make_Ball(-7.00, 0.0, 0.0, 0.0, 1.0, 1000000.0)
|
||||
```
|
||||
|
||||
This creates and initializes seven *Ball* objects needed to configure a Newton's cradle.
|
||||
|
||||
### 3. Call the Wrapped Class Constructor Directly
|
||||
The third method is to call the wrapped constructor of the class directly. This is analogous to declaring local
|
||||
variables in C/C++ routines. And like local variables in C/C++ if the python variable goes out of scope in the
|
||||
input file, then python will try and free the memory associated with the local object. Memory allocated this
|
||||
way is not checkpointable or data recordable.
|
||||
|
||||
@ -16,14 +16,27 @@ S_main_${TRICK_HOST_CPU}.exe [trick_version] [sie]
|
||||
[-u <user_defined_arguments>]
|
||||
```
|
||||
|
||||
- The first argument in the command line must be the simulation input file name. The input file name can be in the form of a full path name but MUST have a RUN_<name> directory immediately above the input file name. By default, all the simulation output is directed to this RUN_<name> directory. The standard <input_file_name> is input.py; however, a simulation could be started from a checkpoint file by substituting chkpnt_<time> in for <input_file_name> for non-Master/Slave and non-Import/Export simulations. For Master/Slave and Import/Export simulations you must have the simulation running, and the simulation must be in a freeze state before reloading a checkpoint.
|
||||
- The trick_version option will tell what version of Trick built the S_main executable.
|
||||
- The sie option will generate the smart input editor (SIE) resource file (CP will by default invoke the S_main executable with the sie option to generate this file).
|
||||
- The '-d' argument is optional and, if specified, starts the simulation in an input file verification mode. In this mode the entire input file is read, echoed to standard out, and then the simulation exits without calling any jobs listed in the S_define file. This mode helps debug input file syntax errors.
|
||||
- The '-O <output_file_path>' option allows the user to specify the directory to which simulation data log files will be written. If this option is omitted, the RUN_<name> directory is used.
|
||||
- The '-OO <output_file_path>' option allows the user to specify the directory to which ALL simulation output files will be written. If this option is omitted, the RUN_<name> directory is used.
|
||||
- The '--read-only-sim' flag can be used to redirect all files written at simulation runtime into the output directory.
|
||||
- The '-u' option specifies that all remaining arguments are meant to be used by user supplied jobs. All arguments after the -u can be accessed internal to the simulation jobs by calling the get_cmnd_args() function of the executive as illustrated below. In a master/slave simulation, the master's -u args will be passed to the slave.
|
||||
- The first argument in the command line must be the simulation input file name. The input file name can be in the form of a full path name but MUST have a `RUN_<name>` directory immediately above the input file name. By default, all the simulation output is directed to this `RUN_<name>` directory. The standard `<input_file_name>` is input.py; however, a simulation could be started from a checkpoint file by substituting `chkpnt_<time>` in for `<input_file_name>` for non-Master/Slave and non-Import/Export simulations. For Master/Slave and Import/Export simulations you must have the simulation running, and the simulation must be in a freeze state before reloading a checkpoint.
|
||||
- The `trick_version` option will tell what version of Trick built the S_main executable.
|
||||
- The `sie` option will generate the smart input editor (SIE) resource file.
|
||||
- The `-d` argument is optional and, if specified, starts the simulation in an input file verification mode. In this mode the entire input file is read, echoed to standard out, and then the simulation exits without calling any jobs listed in the S_define file. This mode helps debug input file syntax errors.
|
||||
- The `-O <output_file_path>` option allows the user to specify the directory to which simulation data log files will be written. If this option is omitted, the `RUN_<name>` directory is used.
|
||||
- Data Products specification DP_xxx.xml files if generated such as for frame logging are saved in `DP_Product` directory.
|
||||
- The `-OO <output_file_path>` option allows the user to specify the directory to which ALL simulation output files will be written. If this option is omitted, the `RUN_<name>` directory is used.
|
||||
- Two subdirectories are automatically created in the designated `<output_file_path>`:
|
||||
- `DP_Product`
|
||||
- Data Products sepcification DP_xxx.xml files are saved in this folder.
|
||||
- `RUN_<name>`
|
||||
- All simulation output files, excluding DP_xxx.xml files, are saved in this folder. Additionally, the S_sie.resource file is copied to this directory.
|
||||
- The `--read-only-sim` flag can be used to redirect all files written at simulation runtime into the output directory.
|
||||
- The `--read-only-sim` flag requires either the `-O` or `-OO` option to be used.
|
||||
- When the `-O <output_file_path>` option is used and `trick.trick.sie_append_runtime_objs()` is called from the input file, the S_sie.resource file with appended runtime objects is saved in `<output_file_path>`.
|
||||
- When the `-OO <output_file_path>` option is used and `trick.trick.sie_append_runtime_objs()` is called from the input file, the S_sie.resource file with runtime objects appended is saved in `<output_file_path>/RUN_<name>`.
|
||||
- If `trick.trick.sie_append_runtime_objs()` is called from the input file, the S_sie.resource file is to be appended with runtime objects.
|
||||
- When neither the `-O` nor `-OO` option is used, the S_sie.resource file with runtime objects appended is saved in the current directory from which the simulation is executed.
|
||||
- When the `-O <output_file_path>` option is used without the `--read-only-sim` flag, the S_sie.resource file with runtime objects appended is saved in the current directory from which the simulation is executed.
|
||||
- When the `-OO <output_file_path>` option is used without the `--read-only-sim` flag, the S_sie.resource file with runtime objects appended is saved in `<output_file_path>/RUN_<name>`.
|
||||
- The `-u` option specifies that all remaining arguments are meant to be used by user supplied jobs. All arguments after the -u can be accessed internal to the simulation jobs by calling the get_cmnd_args() function of the executive as illustrated below. In a master/slave simulation, the master's `-u` args will be passed to the slave.
|
||||
|
||||
The following code example shows how a function can access the command line arguments during execution.
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
Trick provides the following graphical user interfaces:
|
||||
|
||||
## Simulation Control Panel
|
||||
## [Sim Control Panel](SimControlPanel)
|
||||
|
||||
Send control commands to and view the status of a simulation.
|
||||
|
||||
|
||||
@ -0,0 +1,86 @@
|
||||
| [Home](/trick) → [Documentation Home](../../Documentation-Home) → [Running a Simulation](../Running-a-Simulation) → [Runtime GUIs](Runtime-GUIs) → Sim Control Panel |
|
||||
|------------------------------------------------------------------|
|
||||
|
||||
## Sim Control Panel
|
||||
|
||||
The Sim Control Panel is a graphical user interface that allows users to control and view the state of a simulation.
|
||||
|
||||
### Launching
|
||||
|
||||
The Panel can be launched in two ways:
|
||||
|
||||
- Via the command line `${TRICK_HOME}/bin/trick-simcontrol [hostname] [port number]`
|
||||
- The hostname and port number are optional
|
||||
|
||||
- Using the input file to launch it automatically, see [Automatically Launching Applications](Runtime-GUIs#automatically-launching-applications)
|
||||
|
||||
### The GUI
|
||||
|
||||
The GUI pictured below may have a different look and feel based on the architecture of the machine on which it is running, but the functionality will remain the same.
|
||||
|
||||
|
||||
|
||||
#### File Menu
|
||||
|
||||
The File menu pictured below contains operations to manage the Sim Control Panel's status messages as well as its look and feel.
|
||||
|
||||
|
||||
|
||||
- **Font:** Opens a dialogue to customize the font of the status message pane
|
||||
|
||||
- **Save Status Messages:** Opens a file chooser that allows you to save the current status messages to a specific file
|
||||
|
||||
- **Clear Status Message Log:** Clears any messages within the status message pane
|
||||
|
||||
- **Look and Feel:** Changes the theme and color palette of the Sim Control Panel
|
||||
|
||||
- **Exit:** Exits the application
|
||||
|
||||
#### Actions Menu
|
||||
|
||||
|
||||
|
||||
- **Start Trick View:** Opens an instance of the Trick View application connected to the current simulation. See [Trick View](TrickView) for more details.
|
||||
|
||||
- **Start Event/Malfunction Trick View:** Opens an instance of the Events/Malfunctions Trick View application connected to the current simulation. See [Events/Malfunctions Trick View](MalfunctionsTrickView) for more details.
|
||||
|
||||
- **Freeze At:** Sets the simulation to enter freeze mode at a specific simulation time
|
||||
|
||||
- **Freeze In:** Puts the simulation in freeze mode after a specified number of simulation seconds
|
||||
|
||||
- **Checkpoint Objects:** Specifies which objects are to be checkpointed when the `Dump Chkpnt` button is pressed
|
||||
|
||||
- **Throttle:** Opens a dialogue with a slider for you to set the maximum Sim Time / Real-Time Ratio. By default, the scale is between 1.0 and 10.0 but you can increase the maximum to 1000. It functionally allows simulations to run faster than real-time up to their maximum capable speed
|
||||
|
||||
#### Command Panel
|
||||
|
||||
- **Step:** Steps through each executing job, pausing before proceeding to the next
|
||||
|
||||
- **Start:** Puts the simulation in run mode
|
||||
|
||||
- **Freeze:** Puts the simulation in freeze mode
|
||||
|
||||
- **Shutdown:** Shuts the simulation down
|
||||
|
||||
- **Lite:** Shrinks the Sim Control Panel to hide the status message pane and Trick Logo or returns it to the default size via a toggle button
|
||||
|
||||
- **Data Rec On:** Toggles data recording on or off
|
||||
|
||||
- **RealTime On:** Toggles real-time mode in a simulation
|
||||
|
||||
- **Dump Chkpnt:** Opens a file chooser to save a checkpoint file
|
||||
|
||||
- **Load Chkpnt:** Opens a file chooser to choose a checkpoint file to load into the simulation
|
||||
|
||||
- **Exit:** Closes the Sim Control Panel
|
||||
|
||||
#### Misc
|
||||
|
||||
##### Simulation Overruns
|
||||
The Sim Control Panel shows which simulation is running and keeps count of its overruns.
|
||||
|
||||
##### Status Message Panel
|
||||
This panel is where any error or status messaging for the simulation appears. The search bar at the bottom allows the user to find specific text within the panel.
|
||||
|
||||
##### Simulation Connection
|
||||
The bottom part of the Sim Control Panel has a dropdown where the user can input the hostname and port number of the simulation to which the user is attempting to connect. The hostname and port number must be separated by either a space or a colon. The user can also use the dropdown menu to select a simulation. The Connect button next to the dropdown initiates the connection attempt.
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 85 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 86 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 25 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 103 KiB |
@ -128,6 +128,8 @@ namespace Trick {
|
||||
bool use_deriv2; // -- set by integration technique
|
||||
|
||||
double dt; // -- set by IntegLoopSimObject.cpp
|
||||
double target_integ_time; // -- set by IntegLoopScheduler.cpp. Final integration time regardless of
|
||||
// intermediate step.
|
||||
#ifndef USE_ER7_UTILS_INTEGRATORS
|
||||
double **state_origin;
|
||||
#endif
|
||||
|
||||
@ -11,6 +11,8 @@ int integrate(void);
|
||||
int integrate_1st_order_ode(const double* deriv, double* state);
|
||||
int integrate_2nd_order_ode(const double* acc, double* vel, double * pos);
|
||||
double get_integ_time(void);
|
||||
double get_integ_dt(void);
|
||||
double get_integ_target_time(void);
|
||||
void set_integ_time(double time_value);
|
||||
void reset_state();
|
||||
#ifndef USE_ER7_UTILS_INTEGRATORS
|
||||
|
||||
@ -97,7 +97,7 @@ my $template_def = qr/template\s* # keyword template
|
||||
\s+[_A-Za-z]\w*\s* # class name
|
||||
/sx ;
|
||||
my $template_var_def = qr/(?:\:\:)?[_A-Za-z][:\w]*\s* # template name
|
||||
<[\w\s\*,:<>]*>\s* # template parameters
|
||||
<[\w\s\*,:<>\[\]]*>\s* # template parameters
|
||||
[_A-Za-z]\w*\s*(?:[{=].*?)?; # var name ;
|
||||
/sx ;
|
||||
|
||||
@ -337,6 +337,24 @@ sub process_file() {
|
||||
print OUT "\n$new_contents" ;
|
||||
print OUT "$contents\n" ;
|
||||
print OUT $global_template_typedefs ;
|
||||
|
||||
# Add _swig_setattr_nondynamic_instance_variable function for raising AttributeError for improper non-class attribute assingment in input processor.
|
||||
# _swig_setattr_nondynamic_instance_variable function is added for each class in process_class subroutine.
|
||||
foreach my $c ( @class_names ) {
|
||||
if ( ! exists $class_typemap_printed{$c} ) {
|
||||
my $c_ = $c ;
|
||||
$c_ =~ s/\:/_/g ;
|
||||
if ( $c !~ /::/ ) {
|
||||
print OUT "\n#if SWIG_VERSION > 0x040000\n";
|
||||
print OUT "%pythoncode %{\n" ;
|
||||
print OUT " if '$c' in globals():\n";
|
||||
print OUT " $c.__setattr__ = _swig_setattr_nondynamic_instance_variable(object.__setattr__)\n" ;
|
||||
print OUT "%}\n" ;
|
||||
print OUT "#endif\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# Add a trick_cast_as macro line for each class parsed in the file. These lines must appear at the bottom of the
|
||||
# file to ensure they are not in a namespace directive and they are after the #define statements they depend on.
|
||||
undef %class_typemap_printed ;
|
||||
@ -479,6 +497,9 @@ sub process_template($$) {
|
||||
my ( $contents_ref , $new_contents_ref ) = @_ ;
|
||||
my $extracted ;
|
||||
|
||||
# Add _swig_setattr_nondynamic_instance_variable function for raising AttributeError for improper class attribute assingment in input processor
|
||||
# The function call is inserted after the 1st { of the class template so it is placed at the top
|
||||
$$contents_ref=~s/{\n/{\n\n#if SWIG_VERSION > 0x040000\n\%pythoncode \%{\n __setattr__ = _swig_setattr_nondynamic_instance_variable(object.__setattr__)\n\%}\n#endif\n/m;
|
||||
if ( $$contents_ref =~ s/^(\s*;)//s ) {
|
||||
$$new_contents_ref .= $1 ;
|
||||
} else {
|
||||
@ -596,15 +617,16 @@ sub process_class($$$$$) {
|
||||
\s*[\{\:]$
|
||||
/sx or die "Internal error" ;
|
||||
$class_name = $1 ;
|
||||
|
||||
my $class_content;
|
||||
$class_content .= $class_string ;
|
||||
my $my_class_contents = $class_string ;
|
||||
|
||||
if ( $class_string !~ /\{$/ ) {
|
||||
$$contents_ref =~ s/^(.*?\s*\{)//s ;
|
||||
$class_content .= $1 ;
|
||||
$my_class_contents .= $1 ;
|
||||
}
|
||||
|
||||
# Add _swig_setattr_nondynamic_instance_variable function for raising AttributeError for improper class attribute assingment in input processor
|
||||
$my_class_contents .= "\n#if SWIG_VERSION > 0x040000\n\%pythoncode \%{\n __setattr__ = _swig_setattr_nondynamic_instance_variable(object.__setattr__)\n\%}\n#endif\n" ;
|
||||
|
||||
($extracted, $$contents_ref) = extract_bracketed( "{" . $$contents_ref , "{}") ;
|
||||
|
||||
# remove the trailing semicolon because we may append text to the class.
|
||||
@ -615,20 +637,11 @@ sub process_class($$$$$) {
|
||||
|
||||
#print "*** extracted = $extracted ***\n" ;
|
||||
#print "*** contents = $$contents_ref ***\n" ;
|
||||
my $save_namespace_content;
|
||||
|
||||
if ( $curr_namespace ne "" ) {
|
||||
my @split_namespaces = split "::", $curr_namespace;
|
||||
my $sanitized_namespace = $split_namespaces[-1] ;
|
||||
my @namespace_split = split /namespace\s*$sanitized_namespace/, $$new_contents_ref;
|
||||
$save_namespace_content = 'namespace ' . $sanitized_namespace . $namespace_split[-1];
|
||||
$$new_contents_ref = join('namespace ' . $sanitized_namespace, @namespace_split[0 .. $#namespace_split-1]);
|
||||
}
|
||||
|
||||
# SWIG doesn't like "const static". Change it to "static const"
|
||||
$extracted =~ s/const\s+static/static const/g ;
|
||||
|
||||
my $isSwigExcludeBlock = 0;
|
||||
my $isSwigExcludeBlock = 0 ;
|
||||
|
||||
# templated variables need to be declared with the SWIG %template directive.
|
||||
# This loop looks for any templated variables and creates the %template lines.
|
||||
@ -638,15 +651,25 @@ sub process_class($$$$$) {
|
||||
|
||||
if ( $non_var ne "" ) {
|
||||
#print "*** non_var = $non_var ***\n" ;
|
||||
$class_content .= $non_var ;
|
||||
$my_class_contents .= $non_var ;
|
||||
my $ifndefSwig = $non_var;
|
||||
if ($isSwigExcludeBlock == 0) {
|
||||
if ($ifndefSwig =~ /(?:ifndef\s*SWIG|if\s*!\s*defined\s*\(\s*SWIG\s*\))/ ) {
|
||||
$isSwigExcludeBlock = 1;
|
||||
my $moreNonVar = 1 ;
|
||||
# search for all instances of #ifndef SWIG, #if !defined(SWIG), and #endif prior to template variable
|
||||
# update $isSwigExcludeBlock to the last instance*
|
||||
# exit when no match is found
|
||||
# * this script does not track preprocessor scope, so any #endif will set $isSwigExcludeBlock to 0
|
||||
# in other words we don't support SWIGing nested preprocessor if statements, use at your peril
|
||||
while ($moreNonVar == 1) {
|
||||
if ($ifndefSwig =~ s/(#\s*ifndef\s*SWIG)|(#\s*if\s*!\s*defined\s*\(\s*SWIG\s*\))|(#\s*endif\s*)// ) {
|
||||
if($1 ne "" or $2 ne "") {
|
||||
$isSwigExcludeBlock = 1 ;
|
||||
}
|
||||
elsif($3 ne "") {
|
||||
$isSwigExcludeBlock = 0 ;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if ($ifndefSwig =~ /endif/ ) {
|
||||
$isSwigExcludeBlock = 1;
|
||||
else {
|
||||
$moreNonVar = 0 ;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -657,6 +680,7 @@ sub process_class($$$$$) {
|
||||
$template_var_def_str =~ /(.*?>)\s*([_A-Za-z]\w*).*?;/s ;
|
||||
my ($template_full_type) = $1 ;
|
||||
my ($var_name) = $2 ;
|
||||
$my_class_contents .= $template_var_def_str ;
|
||||
|
||||
$template_full_type =~ /([_A-Za-z][:\w]*)\s*</ ;
|
||||
my ($template_type) = $1 ;
|
||||
@ -679,28 +703,34 @@ sub process_class($$$$$) {
|
||||
my $identifier = "${sanitized_namespace}${class_name}_${var_name}" ;
|
||||
my $trick_swig_template = "TRICK_SWIG_TEMPLATE_$identifier" ;
|
||||
|
||||
my $typedef;
|
||||
if ($isSwigExcludeBlock == 0) {
|
||||
$typedef = "#ifndef $trick_swig_template\n" ;
|
||||
$typedef .= "#define $trick_swig_template\n";
|
||||
if ($qualified) {
|
||||
$typedef .= "\%template($identifier) $template_full_type;\n" ;
|
||||
} else {
|
||||
if ( $curr_namespace ne "" ) {
|
||||
my $cppns = substr $curr_namespace, 0, -2;
|
||||
$typedef .= "namespace $cppns {\n";
|
||||
$typedef .= "\%template($identifier) $template_full_type;\n}\n" ;
|
||||
} else {
|
||||
$typedef .= "\%template($identifier) $template_full_type;\n" ;
|
||||
}
|
||||
}
|
||||
$typedef .= "#endif\n\n" ;
|
||||
$$new_contents_ref .= $typedef ;
|
||||
# Insert template directive immediately before intsance
|
||||
# This is required as of SWIG 4
|
||||
my $typedef = "\n#ifndef $trick_swig_template\n" ;
|
||||
$typedef .= "#define $trick_swig_template\n" ;
|
||||
$typedef .= "\%template($identifier) $template_full_type;\n" ;
|
||||
$typedef .= "#endif\n" ;
|
||||
|
||||
# SWIG namespace resolution for template directives starts at the local space
|
||||
# Therefore, if the type is qualified, assume it's fully qualified and put the
|
||||
# %template directive in the global namespace by escaping the current namespace
|
||||
if ($curr_namespace ne "") {
|
||||
my $in_same_namespace = 1 ;
|
||||
if ($template_full_type =~ /^\w*(::)\w+</) {
|
||||
$in_same_namespace = 0 ;
|
||||
}
|
||||
if ($in_same_namespace eq 0) {
|
||||
$curr_namespace =~ /(.*)::/ ;
|
||||
$typedef = "\n}" . $typedef . "namespace " . $1 . " {" ;
|
||||
}
|
||||
}
|
||||
|
||||
if ($isSwigExcludeBlock == 0) {
|
||||
$template_typedefs .= $typedef ;
|
||||
}
|
||||
|
||||
$processed_templates{$template_type_no_sp} = 1 ;
|
||||
}
|
||||
}
|
||||
$class_content .= $template_var_def_str ;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -708,19 +738,18 @@ sub process_class($$$$$) {
|
||||
|
||||
push @$class_names_ref , "$curr_namespace$class_name" ;
|
||||
|
||||
# write out the templated variable declaration lines found in this class.
|
||||
$$new_contents_ref .= $template_typedefs."\n" ;
|
||||
|
||||
$$new_contents_ref .= $my_class_contents ;
|
||||
# write the class contents and semicolon to ensure any template declarations below are after the semicolon.
|
||||
$class_content .= "\n#if SWIG_VERSION > 0x040000\n\%pythoncode \%{\n __setattr__ = _swig_setattr_nondynamic_instance_variable(object.__setattr__)\n\%}\n#endif\n" ;
|
||||
$class_content .= $extracted . ";\n" ;
|
||||
$$new_contents_ref .= $extracted . ";\n" ;
|
||||
|
||||
my $c_ = "$curr_namespace$class_name" ;
|
||||
$c_ =~ s/\:/_/g ;
|
||||
# Add a #define line that signals that this class has been processed by swig. Classes excluded in #if 0 blocks will
|
||||
# not have this #define defined.
|
||||
$class_content .= "#define TRICK_SWIG_DEFINED_$c_" ;
|
||||
if ( $save_namespace_content ne "" ) {
|
||||
$$new_contents_ref .= $save_namespace_content;
|
||||
}
|
||||
$$new_contents_ref .= $class_content;
|
||||
$$new_contents_ref .= "#define TRICK_SWIG_DEFINED_$c_" ;
|
||||
}
|
||||
|
||||
## ================================================================================
|
||||
@ -756,7 +785,7 @@ sub process_typedef_struct($$$$) {
|
||||
my ($typedef_struct_string , $contents_ref, $new_contents_ref , $class_names_ref) = @_ ;
|
||||
|
||||
my $extracted ;
|
||||
my ($begin, $tail , $struct_names, @struct_names) ;
|
||||
my ($tail , $struct_names, @struct_names) ;
|
||||
|
||||
#print "*** typedef_struct_string = $typedef_struct_string ***\n" ;
|
||||
|
||||
@ -765,7 +794,6 @@ sub process_typedef_struct($$$$) {
|
||||
$typedef_struct_string =~ s/((?:typedef\s+)?(struct|union)\s* # the words typedef struct|union
|
||||
([_A-Za-z]\w*)?\s* # optional name
|
||||
{)//sx ;
|
||||
$begin = $3 ;
|
||||
|
||||
($extracted, $$contents_ref) = extract_bracketed( "{" . $$contents_ref , "{}") ;
|
||||
#print "*** extracted = $extracted ***\n" ;
|
||||
@ -780,9 +808,6 @@ sub process_typedef_struct($$$$) {
|
||||
$struct_names =~ s/\s//g ;
|
||||
@struct_names = split /,/ , $struct_names ;
|
||||
|
||||
if ( $begin ne "" ) {
|
||||
push @$class_names_ref , $begin ;
|
||||
}
|
||||
foreach my $s ( @struct_names ) {
|
||||
if ( $s !~ /\*/ ) {
|
||||
push @$class_names_ref , $s ;
|
||||
|
||||
@ -465,9 +465,9 @@ class VariableServerSimObject : public Trick::SimObject {
|
||||
// monte carlo slave sim children, and the monte carlo master.
|
||||
// monte carlo slave parents do not reach initialization.
|
||||
{TRK} P0 ("initialization") trick_ret = vs.init() ;
|
||||
{TRK} ("monte_master_init") trick_ret = vs.init() ;
|
||||
|
||||
#ifndef TRICK_NO_MONTE_CARLO
|
||||
{TRK} ("monte_master_init") trick_ret = vs.init() ;
|
||||
{TRK} P1 ("initialization") monte_carlo_disable_all_apps() ;
|
||||
#endif
|
||||
{TRK} P1 ("initialization") Trick::launch_all_external_applications();
|
||||
|
||||
@ -2995,6 +2995,24 @@ def main():
|
||||
TRICK_EXPECT_TRUE( test_so.test_true(), test_suite , "boolean function return" )
|
||||
TRICK_EXPECT_FALSE( test_so.test_false(), test_suite , "boolean function return" )
|
||||
|
||||
######################################################################################################################
|
||||
|
||||
test_suite = "SWIG Templates"
|
||||
|
||||
test_so.obj.class_no_ns.tnns.x = 1
|
||||
test_so.obj.class_no_ns.tns.y = 2
|
||||
test_so.obj.class_ns.tnns.x = 3
|
||||
test_so.obj.class_ns.tns.y = 4
|
||||
test_so.obj.foo1.bar.z = 5
|
||||
test_so.obj.foo2.bar.z = 6
|
||||
|
||||
TRICK_EXPECT_EQ( test_so.obj.class_no_ns.tnns.x, 1, test_suite , "template member access" )
|
||||
TRICK_EXPECT_EQ( test_so.obj.class_no_ns.tns.y, 2, test_suite , "template member access" )
|
||||
TRICK_EXPECT_EQ( test_so.obj.class_ns.tnns.x, 3, test_suite , "template member access" )
|
||||
TRICK_EXPECT_EQ( test_so.obj.class_ns.tns.y, 4, test_suite , "template member access" )
|
||||
TRICK_EXPECT_EQ( test_so.obj.foo1.bar.z, 5, test_suite , "template member access" )
|
||||
TRICK_EXPECT_EQ( test_so.obj.foo2.bar.z, 6, test_suite , "template member access" )
|
||||
|
||||
######################################################################################################################
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
@ -9,8 +9,25 @@ LIBRARY DEPENDENCIES:
|
||||
#include "sim_objects/default_trick_sys.sm"
|
||||
|
||||
##include "test_ip/include/ClassOfEverything.hh"
|
||||
##include "test_ip/include/ArrayTemplate.hh"
|
||||
##include "test_ip/include/OverloadedVariable.hh"
|
||||
|
||||
class ArrayTemplateSimObject : public Trick::SimObject
|
||||
{
|
||||
public:
|
||||
ArrayTemplateSimObject(const ArrayTemplateSimObject&) = delete;
|
||||
ArrayTemplateSimObject& operator=(const ArrayTemplateSimObject&) = delete;
|
||||
|
||||
double a[3];
|
||||
ArrayTemplate<double[3]> arryTemp;
|
||||
|
||||
ArrayTemplateSimObject()
|
||||
: arryTemp(a)
|
||||
{
|
||||
}
|
||||
};
|
||||
ArrayTemplateSimObject arry_temp_object;
|
||||
|
||||
class testSimObject : public Trick::SimObject {
|
||||
|
||||
public:
|
||||
|
||||
37
test/SIM_test_ip/models/test_ip/include/ArrayTemplate.hh
Normal file
37
test/SIM_test_ip/models/test_ip/include/ArrayTemplate.hh
Normal file
@ -0,0 +1,37 @@
|
||||
/**
|
||||
@file
|
||||
|
||||
@verbatim
|
||||
PURPOSE:
|
||||
(Test if we can build with arrays as template parameters)
|
||||
@endverbatim
|
||||
*******************************************************************************/
|
||||
|
||||
#ifndef ARRAY_TEMPLATE_TESTS_HH
|
||||
#define ARRAY_TEMPLATE_TESTS_HH
|
||||
|
||||
// System include files.
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
||||
|
||||
template <class SourceType>
|
||||
class ArrayTemplate
|
||||
{
|
||||
public:
|
||||
ArrayTemplate(const SourceType& source)
|
||||
: source(source)
|
||||
{
|
||||
}
|
||||
|
||||
ArrayTemplate(const ArrayTemplate&) = delete;
|
||||
ArrayTemplate& operator=(const ArrayTemplate&) = delete;
|
||||
|
||||
private:
|
||||
const SourceType& source;
|
||||
};
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@ -28,6 +28,8 @@ LIBRARY DEPENDENCY:
|
||||
#include "test_ip/include/NoICG.hh"
|
||||
#include "exclude_me/include/exclude_me.hh"
|
||||
#include "test_ip/include/Namespace_tests.hh"
|
||||
#include "test_ip/include/TemplateTest.hh"
|
||||
#include "test_ip/include/IfndefSwigTest.hh"
|
||||
|
||||
/** @class Ball
|
||||
@brief ball in C++
|
||||
@ -441,6 +443,12 @@ class ClassOfEverything {
|
||||
std::map < std::string , int > msi ;
|
||||
std::list < std::string > ls ;
|
||||
|
||||
ClassNoNS class_no_ns ;
|
||||
NS2::ClassNS class_ns ;
|
||||
|
||||
a::Foo foo1;
|
||||
b::Foo2 foo2;
|
||||
|
||||
private:
|
||||
ClassOfEverything (const ClassOfEverything &);
|
||||
ClassOfEverything & operator= (const ClassOfEverything &);
|
||||
|
||||
35
test/SIM_test_ip/models/test_ip/include/FooB.hh
Normal file
35
test/SIM_test_ip/models/test_ip/include/FooB.hh
Normal file
@ -0,0 +1,35 @@
|
||||
/********************************* TRICK HEADER *******************************
|
||||
PURPOSE:
|
||||
()
|
||||
LIBRARY DEPENDENCY:
|
||||
()
|
||||
PROGRAMMERS:
|
||||
(((Your Name) (Company Name) (Date) (Trick tutorial)))
|
||||
*******************************************************************************/
|
||||
|
||||
#ifndef FOOB_HH_
|
||||
#define FOOB_HH_
|
||||
|
||||
namespace FooNamespace
|
||||
{
|
||||
|
||||
// RestartableStateIntegrator
|
||||
template<int T>
|
||||
class FooA
|
||||
{
|
||||
public:
|
||||
|
||||
int A = T;
|
||||
};
|
||||
|
||||
// RestartableFirstOrderODEIntegrator
|
||||
template<int T>
|
||||
class FooB : public FooA<3>
|
||||
{
|
||||
public:
|
||||
int B = T;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
36
test/SIM_test_ip/models/test_ip/include/FooD.hh
Normal file
36
test/SIM_test_ip/models/test_ip/include/FooD.hh
Normal file
@ -0,0 +1,36 @@
|
||||
/********************************* TRICK HEADER *******************************
|
||||
PURPOSE:
|
||||
()
|
||||
LIBRARY DEPENDENCY:
|
||||
()
|
||||
PROGRAMMERS:
|
||||
(((Your Name) (Company Name) (Date) (Trick tutorial)))
|
||||
*******************************************************************************/
|
||||
|
||||
#ifndef FOOD_HH_
|
||||
#define FOOD_HH_
|
||||
|
||||
#include "FooB.hh"
|
||||
|
||||
namespace FooNamespace
|
||||
{
|
||||
|
||||
// RestartableSecondOrderODEIntegrator
|
||||
class FooC : public FooA<1>
|
||||
{
|
||||
public:
|
||||
int C;
|
||||
};
|
||||
|
||||
// RestartableSimpleSecondOrderODEIntegrator
|
||||
template<int T>
|
||||
class FooD : public FooC
|
||||
{
|
||||
public:
|
||||
int D = T;
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
62
test/SIM_test_ip/models/test_ip/include/IfndefSwigTest.hh
Normal file
62
test/SIM_test_ip/models/test_ip/include/IfndefSwigTest.hh
Normal file
@ -0,0 +1,62 @@
|
||||
/********************************* TRICK HEADER *******************************
|
||||
PURPOSE:
|
||||
()
|
||||
LIBRARY DEPENDENCY:
|
||||
()
|
||||
PROGRAMMERS:
|
||||
(((Your Name) (Company Name) (Date) (Trick tutorial)))
|
||||
*******************************************************************************/
|
||||
|
||||
#ifndef FOO_HH_
|
||||
#define FOO_HH_
|
||||
|
||||
#include "FooB.hh"
|
||||
#include "FooD.hh"
|
||||
|
||||
namespace FooNamespace
|
||||
{
|
||||
|
||||
// RestartableScalarFirstOrderODEIntegrator
|
||||
class FooContB {
|
||||
public:
|
||||
FooContB() : d(12.0) {}
|
||||
|
||||
// RestartableFirstOrderODEIntegrator
|
||||
FooB<2> fooB;
|
||||
|
||||
FooB<2> fooB2;
|
||||
|
||||
double d;
|
||||
};
|
||||
|
||||
|
||||
// RestartableT3SecondOrderODEIntegrator
|
||||
class FooContD {
|
||||
public:
|
||||
FooContD() : d(12.0) {}
|
||||
|
||||
// RestartableSimpleSecondOrderODEIntegrator
|
||||
#ifndef TESTING_SWIG
|
||||
# ifndef SWIG
|
||||
// THIS SHOULD PREVENT SWIG FROM MAKING ANY TEMPLATE REFERENCES TO EXCLUDED FooD TYPE
|
||||
FooD<1> fooD;
|
||||
|
||||
FooD<2> fooD2;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
int spacer;
|
||||
|
||||
#if ! defined ( SWIG )
|
||||
// THIS SHOULD PREVENT SWIG FROM MAKING ANY TEMPLATE REFERENCES TO EXCLUDED FooD TYPE
|
||||
FooD<3> fooD3;
|
||||
|
||||
FooD<4> fooD4;
|
||||
#endif
|
||||
|
||||
double d;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -11,10 +11,10 @@ PURPOSE:
|
||||
#define TEMPLATETEST_HH
|
||||
|
||||
template <class A, class B>
|
||||
class TTT {
|
||||
class TTT_test {
|
||||
public:
|
||||
|
||||
TTT() {
|
||||
TTT_test() {
|
||||
aa = 0 ;
|
||||
bb = 0 ;
|
||||
cc = NULL ;
|
||||
@ -22,11 +22,11 @@ class TTT {
|
||||
} ;
|
||||
A aa ;
|
||||
B bb ;
|
||||
TTT<A,B> * ttt ;
|
||||
TTT_test<A,B> * ttt ;
|
||||
|
||||
typedef TTT<A,B> C ;
|
||||
typedef TTT_test<A,B> C ;
|
||||
C * cc ;
|
||||
typedef TTT<B,A> D ;
|
||||
typedef TTT_test<B,A> D ;
|
||||
D * dd ;
|
||||
} ;
|
||||
|
||||
@ -36,7 +36,7 @@ class TemplateTest {
|
||||
friend void init_attrTemplateTest() ;
|
||||
|
||||
public:
|
||||
TTT< int , double > TTT_var ;
|
||||
TTT_test< int , double > TTT_var ;
|
||||
|
||||
};
|
||||
|
||||
@ -44,5 +44,55 @@ class TemplateTest {
|
||||
%struct_str(TemplateTest)
|
||||
#endif
|
||||
|
||||
//Verify we can build templates/intsantiations defined in different combinations of namespaces
|
||||
template <class T>
|
||||
struct TemplateNoNS {T x;};
|
||||
|
||||
namespace NS1 {
|
||||
template <class T>
|
||||
struct TemplateNS {T y;};
|
||||
}
|
||||
|
||||
class ClassNoNS {
|
||||
public:
|
||||
TemplateNoNS<int> tnns;
|
||||
NS1::TemplateNS<int> tns;
|
||||
};
|
||||
|
||||
namespace NS2 {
|
||||
class ClassNS {
|
||||
public:
|
||||
TemplateNoNS<int> tnns;
|
||||
NS1::TemplateNS<int> tns;
|
||||
};
|
||||
}
|
||||
|
||||
//Verify we can build templates/intsantiations defined in the same namespace
|
||||
namespace a {
|
||||
|
||||
template <class T>
|
||||
struct Bar {T z;};
|
||||
|
||||
class Foo {
|
||||
public:
|
||||
Bar<int> bar;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
//Verify we can build templates/intsantiations defined in different namespaces
|
||||
namespace b {
|
||||
|
||||
class Foo2 {
|
||||
public:
|
||||
a::Bar<int> bar;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
//Verify we can build with templated functions (isn't actually SWIG-ified, but should be ignored)
|
||||
template <typename T> void templated_function() {}
|
||||
|
||||
|
||||
#endif /* _BALL_HH_ */
|
||||
|
||||
|
||||
@ -304,7 +304,7 @@ SIM_test_output_dir:
|
||||
RUN_test/input.py -OO sim_output --read-only-sim:
|
||||
returns: 0
|
||||
analyze: 'python3 test/SIM_test_output_dir/ref_files/check_file_endings.py test/SIM_test_output_dir/ref_files/ref_compiletime_S_sie.resource test/SIM_test_output_dir/S_sie.resource'
|
||||
analyze: 'python3 test/SIM_test_output_dir/ref_files/check_file_endings.py test/SIM_test_output_dir/ref_files/ref_runtime_S_sie.resource test/SIM_test_output_dir/sim_output/S_sie.resource'
|
||||
analyze: 'python3 test/SIM_test_output_dir/ref_files/check_file_endings.py test/SIM_test_output_dir/ref_files/ref_runtime_S_sie.resource test/SIM_test_output_dir/sim_output/RUN_test/S_sie.resource'
|
||||
|
||||
|
||||
# The variable server client and SIM_amoeba sometimes fail to connect and need to be retried
|
||||
|
||||
@ -18,6 +18,7 @@ import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
import java.awt.event.ItemEvent;
|
||||
import java.awt.event.ItemListener;
|
||||
import java.awt.Desktop;
|
||||
import java.beans.PropertyChangeEvent;
|
||||
import java.beans.PropertyChangeListener;
|
||||
import java.io.BufferedReader;
|
||||
@ -31,6 +32,7 @@ import java.net.InetSocketAddress;
|
||||
import java.net.MulticastSocket;
|
||||
import java.net.UnknownHostException;
|
||||
import java.net.SocketTimeoutException;
|
||||
import java.net.URI;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.CharBuffer;
|
||||
import java.nio.channels.NotYetConnectedException;
|
||||
@ -239,6 +241,18 @@ public class SimControlApplication extends TrickApplication implements PropertyC
|
||||
launchTrickApplication("mtv", host + " " + port);
|
||||
}
|
||||
|
||||
@Action
|
||||
public void openWiki() {
|
||||
if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.BROWSE)) {
|
||||
try {
|
||||
Desktop.getDesktop().browse(new URI("https://nasa.github.io/trick/index"));
|
||||
}
|
||||
catch(Exception e) {
|
||||
System.out.println("Exception occurred while opening wiki: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Action
|
||||
public void freezeAt() {
|
||||
actionController.handleFreezeAt(simState.getExecOutTime(), getMainFrame());
|
||||
@ -416,6 +430,7 @@ public class SimControlApplication extends TrickApplication implements PropertyC
|
||||
public void getInitializationPacket() {
|
||||
String simRunDir = null;
|
||||
String[] results = null;
|
||||
boolean masterslave_enabled;
|
||||
try {
|
||||
String errMsg = "Error: SimControlApplication:getInitializationPacket()";
|
||||
try {
|
||||
@ -455,6 +470,10 @@ public class SimControlApplication extends TrickApplication implements PropertyC
|
||||
|
||||
simState = new SimState();
|
||||
|
||||
commandSimcom.put("trick.var_exists(\"trick_master_slave.master.num_slaves\")");
|
||||
results = commandSimcom.get().split("\t");
|
||||
masterslave_enabled = results[1].equals("1");
|
||||
|
||||
commandSimcom.put("trick.var_set_client_tag(\"SimControl\")\n");
|
||||
commandSimcom.put("trick.var_add(\"trick_sys.sched.sim_start\") \n" +
|
||||
"trick.var_add(\"trick_sys.sched.terminate_time\") \n" +
|
||||
@ -462,9 +481,13 @@ public class SimControlApplication extends TrickApplication implements PropertyC
|
||||
"trick.var_add(\"trick_cmd_args.cmd_args.default_dir\") \n" +
|
||||
"trick.var_add(\"trick_cmd_args.cmd_args.cmdline_name\") \n" +
|
||||
"trick.var_add(\"trick_cmd_args.cmd_args.input_file\") \n" +
|
||||
"trick.var_add(\"trick_cmd_args.cmd_args.run_dir\") \n" +
|
||||
"trick.var_add(\"trick_master_slave.master.num_slaves\") \n" +
|
||||
"trick.var_send() \n" +
|
||||
"trick.var_add(\"trick_cmd_args.cmd_args.run_dir\") \n");
|
||||
|
||||
if (masterslave_enabled) {
|
||||
commandSimcom.put("trick.var_add(\"trick_master_slave.master.num_slaves\") \n");
|
||||
}
|
||||
|
||||
commandSimcom.put("trick.var_send() \n" +
|
||||
"trick.var_clear() \n");
|
||||
|
||||
results = commandSimcom.get().split("\t");
|
||||
@ -480,7 +503,7 @@ public class SimControlApplication extends TrickApplication implements PropertyC
|
||||
simStopTime = terminateTime/execTimeTicValue - simStartTime;
|
||||
}
|
||||
|
||||
slaveCount = Integer.parseInt(results[8]);
|
||||
slaveCount = masterslave_enabled ? Integer.parseInt(results[8]) : 0;
|
||||
|
||||
simRunDirField = new JTextField[slaveCount+1];
|
||||
overrunField = new JTextField[slaveCount+1];
|
||||
@ -1005,9 +1028,11 @@ public class SimControlApplication extends TrickApplication implements PropertyC
|
||||
"---",
|
||||
"startMTV",
|
||||
"---",
|
||||
"throttle"
|
||||
"throttle",
|
||||
"---",
|
||||
"openWiki"
|
||||
};
|
||||
JToolBar toolBar = new JToolBar();
|
||||
JToolBar toolBar = new JToolBar();
|
||||
for (String actionName : toolbarActionNames) {
|
||||
if (actionName.equals("---")) {
|
||||
toolBar.addSeparator();
|
||||
|
||||
@ -237,7 +237,7 @@ public class SimControlActionController {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Invoked when the users presses the Step button.
|
||||
* @param debug_flag single step the sim
|
||||
|
||||
@ -24,6 +24,10 @@ startMTV.Action.text = Start &Event/Malfunction Trick View
|
||||
startMTV.Action.shortDescription = Start Event/Malfunction Trick View (MTV)
|
||||
startMTV.Action.icon = mtv_22x22.png
|
||||
|
||||
openWiki.Action.text = Open Trick Wiki
|
||||
openWiki.Action.shortDescription = Open Trick Wiki in default browser
|
||||
openWiki.Action.icon = question_22x22.png
|
||||
|
||||
freezeAt.Action.text = Freeze &At...
|
||||
freezeAt.Action.shortDescription = Freeze At
|
||||
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 378 B |
@ -253,8 +253,9 @@ int Trick::CommandLineArguments::process_sim_args(int nargs , char **args) {
|
||||
}
|
||||
/* Output data directory */
|
||||
output_dir = user_output_dir = argv[++ii];
|
||||
|
||||
|
||||
if (!strncmp("-OO", argv[ii-1], (size_t) 3)) {
|
||||
output_dir = output_dir + "/" + run_dir;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -713,6 +713,11 @@ int Trick::FrameLog::create_DP_files() {
|
||||
int Trick::FrameLog::create_DP_Product_dir() {
|
||||
int ret=0;
|
||||
DP_dir = "DP_Product";
|
||||
if (std::string(command_line_args_get_user_output_dir()) != std::string(command_line_args_get_output_dir())) {
|
||||
if (!std::string(command_line_args_get_user_output_dir()).empty()) {
|
||||
DP_dir = std::string(command_line_args_get_user_output_dir()) + "/DP_Product";
|
||||
}
|
||||
}
|
||||
ret = mkdir(DP_dir.c_str(), 0777);
|
||||
if (ret == -1) {
|
||||
if (errno == EEXIST) {
|
||||
|
||||
@ -444,6 +444,8 @@ int Trick::IntegLoopScheduler::integrate_dt ( double t_start, double dt) {
|
||||
int ex_pass = 0;
|
||||
bool need_derivs = get_first_step_deriv_from_integrator();
|
||||
|
||||
double target_time = t_start + dt;
|
||||
|
||||
do {
|
||||
ex_pass ++;
|
||||
// Call all of the jobs in the derivative job queue if needed.
|
||||
@ -482,11 +484,12 @@ int Trick::IntegLoopScheduler::integrate_dt ( double t_start, double dt) {
|
||||
if (ex_pass == 1) {
|
||||
trick_curr_integ->time = t_start;
|
||||
trick_curr_integ->dt = dt;
|
||||
trick_curr_integ->target_integ_time = target_time;
|
||||
}
|
||||
|
||||
if (verbosity || trick_curr_integ->verbosity) {
|
||||
message_publish (MSG_DEBUG, "Job: %s, time: %f, dt: %f\n",
|
||||
curr_job->name.c_str(), t_start, dt);
|
||||
message_publish (MSG_DEBUG, "Job: %s, target_integ_time: %f, integ_time: %f, dt: %f, ipass = %d\n",
|
||||
curr_job->name.c_str(), target_time, t_start, dt, ipass);
|
||||
}
|
||||
|
||||
ipass = curr_job->call();
|
||||
|
||||
@ -15,6 +15,7 @@ Trick::Integrator::Integrator() {
|
||||
is_2nd_order_ODE_technique = 0;
|
||||
use_deriv2 = 0;
|
||||
dt = 0.01;
|
||||
target_integ_time = dt;
|
||||
state = NULL;
|
||||
deriv = NULL;
|
||||
deriv2 = NULL;
|
||||
|
||||
@ -22,11 +22,20 @@ extern "C" int integrate_2nd_order_ode(const double* acc, double* vel, double *
|
||||
}
|
||||
|
||||
extern "C" double get_integ_time() {
|
||||
return (trick_curr_integ->time);
|
||||
return (trick_curr_integ->time);
|
||||
}
|
||||
|
||||
extern "C" double get_integ_dt(void) {
|
||||
return (trick_curr_integ->dt);
|
||||
}
|
||||
|
||||
extern "C" double get_integ_target_time(void) {
|
||||
return (trick_curr_integ->target_integ_time);
|
||||
}
|
||||
|
||||
extern "C" void set_integ_time(double time_value) {
|
||||
trick_curr_integ->time = time_value;
|
||||
trick_curr_integ->target_integ_time = time_value;
|
||||
}
|
||||
|
||||
extern "C" void reset_state() {
|
||||
|
||||
@ -135,9 +135,9 @@ int Trick::JITInputFile::compile(std::string file_name) {
|
||||
// rule to link shared library
|
||||
outfile << library_fullpath_name << ": " << object_fullpath_name << std::endl ;
|
||||
#ifdef __APPLE__
|
||||
outfile << "\t" << get_trick_env((char *)"TRICK_CXX") << " -shared -undefined dynamic_lookup -o $@ $< " << std::endl << std::endl ;
|
||||
outfile << "\t" << get_trick_env((char *)"TRICK_CXX") << " " << get_trick_env((char *)"TRICK_LDFLAGS") << " -shared -undefined dynamic_lookup -o $@ $< " << std::endl << std::endl ;
|
||||
#else
|
||||
outfile << "\t" << get_trick_env((char *)"TRICK_CXX") << " -shared -o $@ $< " << std::endl << std::endl ;
|
||||
outfile << "\t" << get_trick_env((char *)"TRICK_CXX") << " " << get_trick_env((char *)"TRICK_LDFLAGS") << " -shared -o $@ $< " << std::endl << std::endl ;
|
||||
#endif
|
||||
// rule to compile cpp file
|
||||
outfile << object_fullpath_name << ": " << file_name << std::endl ;
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "trick/ScheduledJobQueue.hh"
|
||||
#include "trick/ScheduledJobQueueInstrument.hh"
|
||||
@ -34,84 +35,63 @@ Trick::ScheduledJobQueue::~ScheduledJobQueue( ) {
|
||||
}
|
||||
}
|
||||
|
||||
static bool compare_job_data(const Trick::JobData *a, const Trick::JobData *b) {
|
||||
{
|
||||
int ajc = a->job_class;
|
||||
int bjc = b->job_class;
|
||||
if (ajc < bjc)
|
||||
return true;
|
||||
if (ajc > bjc)
|
||||
return false;
|
||||
}
|
||||
{
|
||||
unsigned short ap = a->phase;
|
||||
unsigned short bp = b->phase;
|
||||
if (ap < bp)
|
||||
return true;
|
||||
if (ap > bp)
|
||||
return false;
|
||||
}
|
||||
{
|
||||
int asoi = a->sim_object_id;
|
||||
int bsoi = b->sim_object_id;
|
||||
if (asoi < bsoi)
|
||||
return true;
|
||||
if (asoi > bsoi)
|
||||
return false;
|
||||
}
|
||||
return a->id < b->id;
|
||||
}
|
||||
|
||||
/**
|
||||
@design
|
||||
-# Allocate additional memory for the incoming job
|
||||
-# Find the insertion point in the queue based on the job_class, the phase,
|
||||
the sim_object id, and the job_id
|
||||
-# While searching for the correct insertion spot, copy all jobs that precede
|
||||
the incoming job to the newly allocated queue space followed by the new job.
|
||||
-# Copy jobs that are ordered after the incoming job to the new queue
|
||||
-# Move the jobs after the insertion point to the right by one.
|
||||
-# Insert the new job at the insertion point.
|
||||
-# Increment the size of the queue.
|
||||
*/
|
||||
int Trick::ScheduledJobQueue::push( JobData * new_job ) {
|
||||
|
||||
unsigned int ii , jj ;
|
||||
|
||||
/* Allocate additional memory for the additional job in the queue */
|
||||
JobData ** new_list = (JobData **)calloc( list_size + 1 , sizeof(JobData *)) ;
|
||||
JobData ** new_list = (JobData **)realloc(list, (list_size + 1) * sizeof(JobData *)) ;
|
||||
if (!new_list) {
|
||||
abort();
|
||||
}
|
||||
list = new_list;
|
||||
JobData ** list_end = list + list_size;
|
||||
JobData ** insert_pt = std::upper_bound(list, list_end, new_job, compare_job_data);
|
||||
if (insert_pt != list_end) {
|
||||
memmove(insert_pt + 1, insert_pt, (list_end - insert_pt) * sizeof(JobData *));
|
||||
}
|
||||
*insert_pt = new_job;
|
||||
|
||||
new_job->set_handled(true) ;
|
||||
|
||||
/* Find the correct insertion spot in the queue by comparing
|
||||
the job_class, the phase, the sim_object id, and the job_id in that order. */
|
||||
/* While searching for the correct insertion spot, copy all jobs that precede
|
||||
the incoming job to the newly allocated queue space. */
|
||||
for ( ii = jj = 0 ; ii < list_size ; ii++ ) {
|
||||
if ( list[ii]->job_class == new_job->job_class ) {
|
||||
if ( list[ii]->phase == new_job->phase ) {
|
||||
if ( list[ii]->sim_object_id == new_job->sim_object_id ) {
|
||||
if ( list[ii]->id <= new_job->id ) {
|
||||
new_list[jj++] = list[ii] ;
|
||||
} else {
|
||||
new_list[jj++] = new_job ;
|
||||
break ;
|
||||
}
|
||||
} else if ( list[ii]->sim_object_id < new_job->sim_object_id ) {
|
||||
new_list[jj++] = list[ii] ;
|
||||
} else {
|
||||
new_list[jj++] = new_job ;
|
||||
break ;
|
||||
}
|
||||
} else if ( list[ii]->phase < new_job->phase ) {
|
||||
new_list[jj++] = list[ii] ;
|
||||
} else {
|
||||
new_list[jj++] = new_job ;
|
||||
break ;
|
||||
}
|
||||
} else if ( list[ii]->job_class < new_job->job_class ) {
|
||||
new_list[jj++] = list[ii] ;
|
||||
} else {
|
||||
new_list[jj++] = new_job ;
|
||||
break ;
|
||||
}
|
||||
}
|
||||
|
||||
/* Copy remaining jobs that execute after the incoming job to the new queue space. */
|
||||
if ( ii == list_size ) {
|
||||
/* ii == list_size means the incoming job is the last job */
|
||||
new_list[list_size] = new_job ;
|
||||
} else {
|
||||
/* Inserted new job before the current job. Increment curr_index to point to the correct job */
|
||||
if ( ii < curr_index ) {
|
||||
curr_index++ ;
|
||||
}
|
||||
for ( ; ii < list_size ; ii++ ) {
|
||||
new_list[jj++] = list[ii] ;
|
||||
}
|
||||
}
|
||||
|
||||
/* Increment the size of the queue */
|
||||
list_size++ ;
|
||||
|
||||
/* Free the old queue space */
|
||||
if ( list ) {
|
||||
free(list) ;
|
||||
}
|
||||
|
||||
/* Assign the queue pointer to the new space */
|
||||
list = new_list ;
|
||||
|
||||
return(0) ;
|
||||
|
||||
}
|
||||
@ -534,4 +514,3 @@ int Trick::ScheduledJobQueue::instrument_remove(std::string job_name) {
|
||||
|
||||
return 0 ;
|
||||
}
|
||||
|
||||
|
||||
@ -27,6 +27,26 @@ Trick::Sie::Sie() {
|
||||
the_sie = this ;
|
||||
}
|
||||
|
||||
void copy_file (const std::string& original_filename, const std::string& copy_filename) {
|
||||
std::ifstream original;
|
||||
std::ofstream copy;
|
||||
|
||||
original.open(original_filename.c_str(), std::ios::binary);
|
||||
copy.open(copy_filename.c_str(), std::ios::binary);
|
||||
|
||||
copy << original.rdbuf();
|
||||
|
||||
original.close();
|
||||
copy.close();
|
||||
}
|
||||
|
||||
// Helper function for copying S_sie.resource from default dir to output dir
|
||||
void copy_sie_resource() {
|
||||
std::string original_sie_filename = std::string(command_line_args_get_default_dir()) + "/" + "S_sie.resource";
|
||||
std::string copy_sie_filename = std::string(command_line_args_get_output_dir()) + "/" + "S_sie.resource";
|
||||
copy_file(original_sie_filename, copy_sie_filename);
|
||||
}
|
||||
|
||||
int Trick::Sie::process_sim_args() {
|
||||
|
||||
int argc ;
|
||||
@ -46,13 +66,38 @@ int Trick::Sie::process_sim_args() {
|
||||
exit(0) ;
|
||||
}
|
||||
|
||||
bool read_only = false;
|
||||
bool oo_dir = false;
|
||||
bool o_dir = false;
|
||||
|
||||
// Otherwise, go through the rest of the sim args and look for --read-only-sim
|
||||
for (int i = 1; i < argc; i++) {
|
||||
if (strcmp("--read-only-sim", argv[i]) == 0) {
|
||||
if ((strcmp("--read-only-sim", argv[i]) == 0)) {
|
||||
// Set this flag to move runtime generation of sie into the output directory
|
||||
move_runtime_generation = true;
|
||||
read_only = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// Set oo_dir and o_dir flags accordingly
|
||||
for (int i = 1; i < argc; i++) {
|
||||
if (strncmp("-OO", argv[i], (size_t) 3) == 0) {
|
||||
oo_dir = true;
|
||||
} else if (strncmp("-O", argv[i], (size_t) 2) == 0) {
|
||||
o_dir = true;
|
||||
}
|
||||
}
|
||||
|
||||
// If --read-only-sim is provided without either -OO or -O, exit with error message
|
||||
// For -OO, save S_sie.resource to the output directory with runtime jobs data
|
||||
if (read_only && !oo_dir && !o_dir) {
|
||||
std::cerr << "\nERROR: Missing -O or -OO argument with --read-only-sim flag" << std::endl;
|
||||
exit(1);
|
||||
} else if (oo_dir) {
|
||||
copy_sie_resource();
|
||||
move_runtime_generation = true;
|
||||
}
|
||||
}
|
||||
|
||||
return(0) ;
|
||||
@ -158,26 +203,11 @@ void Trick::Sie::sie_print_xml() {
|
||||
sie_out.close() ;
|
||||
}
|
||||
|
||||
void copy_file (const std::string& original_filename, const std::string& copy_filename) {
|
||||
std::ifstream original;
|
||||
std::ofstream copy;
|
||||
|
||||
original.open(original_filename.c_str(), std::ios::binary);
|
||||
copy.open(copy_filename.c_str(), std::ios::binary);
|
||||
|
||||
copy << original.rdbuf();
|
||||
|
||||
original.close();
|
||||
copy.close();
|
||||
}
|
||||
|
||||
void Trick::Sie::sie_append_runtime_objs() {
|
||||
std::fstream sie_out ;
|
||||
|
||||
if (move_runtime_generation) {
|
||||
std::string original_sie_filename = std::string(command_line_args_get_default_dir()) + "/" + "S_sie.resource" ;
|
||||
std::string copy_sie_filename = std::string(command_line_args_get_output_dir()) + "/" + "S_sie.resource" ;
|
||||
copy_file(original_sie_filename, copy_sie_filename);
|
||||
copy_sie_resource();
|
||||
}
|
||||
|
||||
std::string sie_filename = get_runtime_sie_dir() + "/" + "S_sie.resource" ;
|
||||
@ -223,9 +253,9 @@ void Trick::Sie::sie_append_runtime_objs() {
|
||||
|
||||
std::string Trick::Sie::get_runtime_sie_dir() {
|
||||
if (move_runtime_generation) {
|
||||
return std::string(command_line_args_get_output_dir()) ;
|
||||
return std::string(command_line_args_get_output_dir());
|
||||
} else {
|
||||
return std::string(command_line_args_get_default_dir()) ;
|
||||
return std::string(command_line_args_get_default_dir());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -66,3 +66,19 @@ class swig_double {
|
||||
PyObject * __len__() ;
|
||||
} ;
|
||||
|
||||
%pythoncode %{
|
||||
#if SWIG_VERSION > 0x040000
|
||||
def _trick_setattr_nondynamic_instance_variable(set):
|
||||
def set_instance_attr(self, name, value):
|
||||
if name == "thisown":
|
||||
self.this.own(value)
|
||||
elif name == "this":
|
||||
set(self, name, value)
|
||||
else:
|
||||
msg = f'You cannot add instance attribute \'{name}\' to Trick swig_double'
|
||||
raise AttributeError(msg)
|
||||
return set_instance_attr
|
||||
|
||||
swig_double.__setattr__ = _trick_setattr_nondynamic_instance_variable(object.__setattr__)
|
||||
#endif
|
||||
%}
|
||||
|
||||
@ -89,3 +89,19 @@ class swig_int {
|
||||
PyObject * __bool__() ;
|
||||
} ;
|
||||
|
||||
%pythoncode %{
|
||||
#if SWIG_VERSION > 0x040000
|
||||
def _trick_setattr_nondynamic_instance_variable(set):
|
||||
def set_instance_attr(self, name, value):
|
||||
if name == "thisown":
|
||||
self.this.own(value)
|
||||
elif name == "this":
|
||||
set(self, name, value)
|
||||
else:
|
||||
msg = f'You cannot add instance attribute \'{name}\' to Trick swig_int'
|
||||
raise AttributeError(msg)
|
||||
return set_instance_attr
|
||||
|
||||
swig_int.__setattr__ = _trick_setattr_nondynamic_instance_variable(object.__setattr__)
|
||||
#endif
|
||||
%}
|
||||
|
||||
308
trick_source/web/dashboard/package-lock.json
generated
308
trick_source/web/dashboard/package-lock.json
generated
@ -3610,15 +3610,6 @@
|
||||
"@types/json-schema": "*"
|
||||
}
|
||||
},
|
||||
"@types/eslint-scope": {
|
||||
"version": "3.7.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.5.tgz",
|
||||
"integrity": "sha512-JNvhIEyxVW6EoMIFIvj93ZOywYFatlpu9deeH6eSx6PE3WHYvHaQtmHmQeNw7aA81bYGBPPQqdtBm6b1SsQMmA==",
|
||||
"requires": {
|
||||
"@types/eslint": "*",
|
||||
"@types/estree": "*"
|
||||
}
|
||||
},
|
||||
"@types/estree": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.2.tgz",
|
||||
@ -3954,15 +3945,6 @@
|
||||
"eslint-visitor-keys": "^3.3.0"
|
||||
}
|
||||
},
|
||||
"@webassemblyjs/ast": {
|
||||
"version": "1.11.6",
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
|
||||
"integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
|
||||
"requires": {
|
||||
"@webassemblyjs/helper-numbers": "1.11.6",
|
||||
"@webassemblyjs/helper-wasm-bytecode": "1.11.6"
|
||||
}
|
||||
},
|
||||
"@webassemblyjs/floating-point-hex-parser": {
|
||||
"version": "1.11.6",
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
|
||||
@ -3973,11 +3955,6 @@
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
|
||||
"integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
|
||||
},
|
||||
"@webassemblyjs/helper-buffer": {
|
||||
"version": "1.11.6",
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
|
||||
"integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA=="
|
||||
},
|
||||
"@webassemblyjs/helper-numbers": {
|
||||
"version": "1.11.6",
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
|
||||
@ -3993,17 +3970,6 @@
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
|
||||
"integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="
|
||||
},
|
||||
"@webassemblyjs/helper-wasm-section": {
|
||||
"version": "1.11.6",
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
|
||||
"integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
|
||||
"requires": {
|
||||
"@webassemblyjs/ast": "1.11.6",
|
||||
"@webassemblyjs/helper-buffer": "1.11.6",
|
||||
"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
|
||||
"@webassemblyjs/wasm-gen": "1.11.6"
|
||||
}
|
||||
},
|
||||
"@webassemblyjs/ieee754": {
|
||||
"version": "1.11.6",
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
|
||||
@ -4025,66 +3991,6 @@
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
|
||||
"integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
|
||||
},
|
||||
"@webassemblyjs/wasm-edit": {
|
||||
"version": "1.11.6",
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
|
||||
"integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
|
||||
"requires": {
|
||||
"@webassemblyjs/ast": "1.11.6",
|
||||
"@webassemblyjs/helper-buffer": "1.11.6",
|
||||
"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
|
||||
"@webassemblyjs/helper-wasm-section": "1.11.6",
|
||||
"@webassemblyjs/wasm-gen": "1.11.6",
|
||||
"@webassemblyjs/wasm-opt": "1.11.6",
|
||||
"@webassemblyjs/wasm-parser": "1.11.6",
|
||||
"@webassemblyjs/wast-printer": "1.11.6"
|
||||
}
|
||||
},
|
||||
"@webassemblyjs/wasm-gen": {
|
||||
"version": "1.11.6",
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
|
||||
"integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
|
||||
"requires": {
|
||||
"@webassemblyjs/ast": "1.11.6",
|
||||
"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
|
||||
"@webassemblyjs/ieee754": "1.11.6",
|
||||
"@webassemblyjs/leb128": "1.11.6",
|
||||
"@webassemblyjs/utf8": "1.11.6"
|
||||
}
|
||||
},
|
||||
"@webassemblyjs/wasm-opt": {
|
||||
"version": "1.11.6",
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
|
||||
"integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
|
||||
"requires": {
|
||||
"@webassemblyjs/ast": "1.11.6",
|
||||
"@webassemblyjs/helper-buffer": "1.11.6",
|
||||
"@webassemblyjs/wasm-gen": "1.11.6",
|
||||
"@webassemblyjs/wasm-parser": "1.11.6"
|
||||
}
|
||||
},
|
||||
"@webassemblyjs/wasm-parser": {
|
||||
"version": "1.11.6",
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
|
||||
"integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
|
||||
"requires": {
|
||||
"@webassemblyjs/ast": "1.11.6",
|
||||
"@webassemblyjs/helper-api-error": "1.11.6",
|
||||
"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
|
||||
"@webassemblyjs/ieee754": "1.11.6",
|
||||
"@webassemblyjs/leb128": "1.11.6",
|
||||
"@webassemblyjs/utf8": "1.11.6"
|
||||
}
|
||||
},
|
||||
"@webassemblyjs/wast-printer": {
|
||||
"version": "1.11.6",
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
|
||||
"integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
|
||||
"requires": {
|
||||
"@webassemblyjs/ast": "1.11.6",
|
||||
"@xtuc/long": "4.2.2"
|
||||
}
|
||||
},
|
||||
"@xtuc/ieee754": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
|
||||
@ -4135,10 +4041,10 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"acorn-import-assertions": {
|
||||
"version": "1.9.0",
|
||||
"resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
|
||||
"integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA=="
|
||||
"acorn-import-attributes": {
|
||||
"version": "1.9.5",
|
||||
"resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
|
||||
"integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ=="
|
||||
},
|
||||
"acorn-walk": {
|
||||
"version": "7.2.0",
|
||||
@ -6916,22 +6822,6 @@
|
||||
"once": "^1.4.0"
|
||||
}
|
||||
},
|
||||
"enhanced-resolve": {
|
||||
"version": "5.15.0",
|
||||
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
|
||||
"integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
|
||||
"requires": {
|
||||
"graceful-fs": "^4.2.4",
|
||||
"tapable": "^2.2.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"graceful-fs": {
|
||||
"version": "4.2.11",
|
||||
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
|
||||
"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
|
||||
}
|
||||
}
|
||||
},
|
||||
"entities": {
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
|
||||
@ -11832,11 +11722,11 @@
|
||||
"integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="
|
||||
},
|
||||
"micromatch": {
|
||||
"version": "4.0.5",
|
||||
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
|
||||
"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
|
||||
"version": "4.0.8",
|
||||
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
|
||||
"integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
|
||||
"requires": {
|
||||
"braces": "^3.0.2",
|
||||
"braces": "^3.0.3",
|
||||
"picomatch": "^2.3.1"
|
||||
}
|
||||
},
|
||||
@ -16779,15 +16669,6 @@
|
||||
"loose-envify": "^1.0.0"
|
||||
}
|
||||
},
|
||||
"watchpack": {
|
||||
"version": "2.4.0",
|
||||
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
|
||||
"integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
|
||||
"requires": {
|
||||
"glob-to-regexp": "^0.4.1",
|
||||
"graceful-fs": "^4.1.2"
|
||||
}
|
||||
},
|
||||
"wbuf": {
|
||||
"version": "1.7.3",
|
||||
"resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
|
||||
@ -16815,40 +16696,147 @@
|
||||
"integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="
|
||||
},
|
||||
"webpack": {
|
||||
"version": "5.88.2",
|
||||
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz",
|
||||
"integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==",
|
||||
"version": "5.94.0",
|
||||
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
|
||||
"integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
|
||||
"requires": {
|
||||
"@types/eslint-scope": "^3.7.3",
|
||||
"@types/estree": "^1.0.0",
|
||||
"@webassemblyjs/ast": "^1.11.5",
|
||||
"@webassemblyjs/wasm-edit": "^1.11.5",
|
||||
"@webassemblyjs/wasm-parser": "^1.11.5",
|
||||
"@types/estree": "^1.0.5",
|
||||
"@webassemblyjs/ast": "^1.12.1",
|
||||
"@webassemblyjs/wasm-edit": "^1.12.1",
|
||||
"@webassemblyjs/wasm-parser": "^1.12.1",
|
||||
"acorn": "^8.7.1",
|
||||
"acorn-import-assertions": "^1.9.0",
|
||||
"browserslist": "^4.14.5",
|
||||
"acorn-import-attributes": "^1.9.5",
|
||||
"browserslist": "^4.21.10",
|
||||
"chrome-trace-event": "^1.0.2",
|
||||
"enhanced-resolve": "^5.15.0",
|
||||
"enhanced-resolve": "^5.17.1",
|
||||
"es-module-lexer": "^1.2.1",
|
||||
"eslint-scope": "5.1.1",
|
||||
"events": "^3.2.0",
|
||||
"glob-to-regexp": "^0.4.1",
|
||||
"graceful-fs": "^4.2.9",
|
||||
"graceful-fs": "^4.2.11",
|
||||
"json-parse-even-better-errors": "^2.3.1",
|
||||
"loader-runner": "^4.2.0",
|
||||
"mime-types": "^2.1.27",
|
||||
"neo-async": "^2.6.2",
|
||||
"schema-utils": "^3.2.0",
|
||||
"tapable": "^2.1.1",
|
||||
"terser-webpack-plugin": "^5.3.7",
|
||||
"watchpack": "^2.4.0",
|
||||
"terser-webpack-plugin": "^5.3.10",
|
||||
"watchpack": "^2.4.1",
|
||||
"webpack-sources": "^3.2.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@jridgewell/trace-mapping": {
|
||||
"version": "0.3.25",
|
||||
"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
|
||||
"integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
|
||||
"requires": {
|
||||
"@jridgewell/resolve-uri": "^3.1.0",
|
||||
"@jridgewell/sourcemap-codec": "^1.4.14"
|
||||
}
|
||||
},
|
||||
"@types/estree": {
|
||||
"version": "1.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
|
||||
"integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw=="
|
||||
},
|
||||
"@webassemblyjs/ast": {
|
||||
"version": "1.12.1",
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
|
||||
"integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
|
||||
"requires": {
|
||||
"@webassemblyjs/helper-numbers": "1.11.6",
|
||||
"@webassemblyjs/helper-wasm-bytecode": "1.11.6"
|
||||
}
|
||||
},
|
||||
"@webassemblyjs/helper-buffer": {
|
||||
"version": "1.12.1",
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
|
||||
"integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw=="
|
||||
},
|
||||
"@webassemblyjs/helper-wasm-section": {
|
||||
"version": "1.12.1",
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
|
||||
"integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
|
||||
"requires": {
|
||||
"@webassemblyjs/ast": "1.12.1",
|
||||
"@webassemblyjs/helper-buffer": "1.12.1",
|
||||
"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
|
||||
"@webassemblyjs/wasm-gen": "1.12.1"
|
||||
}
|
||||
},
|
||||
"@webassemblyjs/wasm-edit": {
|
||||
"version": "1.12.1",
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
|
||||
"integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
|
||||
"requires": {
|
||||
"@webassemblyjs/ast": "1.12.1",
|
||||
"@webassemblyjs/helper-buffer": "1.12.1",
|
||||
"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
|
||||
"@webassemblyjs/helper-wasm-section": "1.12.1",
|
||||
"@webassemblyjs/wasm-gen": "1.12.1",
|
||||
"@webassemblyjs/wasm-opt": "1.12.1",
|
||||
"@webassemblyjs/wasm-parser": "1.12.1",
|
||||
"@webassemblyjs/wast-printer": "1.12.1"
|
||||
}
|
||||
},
|
||||
"@webassemblyjs/wasm-gen": {
|
||||
"version": "1.12.1",
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
|
||||
"integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
|
||||
"requires": {
|
||||
"@webassemblyjs/ast": "1.12.1",
|
||||
"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
|
||||
"@webassemblyjs/ieee754": "1.11.6",
|
||||
"@webassemblyjs/leb128": "1.11.6",
|
||||
"@webassemblyjs/utf8": "1.11.6"
|
||||
}
|
||||
},
|
||||
"@webassemblyjs/wasm-opt": {
|
||||
"version": "1.12.1",
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
|
||||
"integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
|
||||
"requires": {
|
||||
"@webassemblyjs/ast": "1.12.1",
|
||||
"@webassemblyjs/helper-buffer": "1.12.1",
|
||||
"@webassemblyjs/wasm-gen": "1.12.1",
|
||||
"@webassemblyjs/wasm-parser": "1.12.1"
|
||||
}
|
||||
},
|
||||
"@webassemblyjs/wasm-parser": {
|
||||
"version": "1.12.1",
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
|
||||
"integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
|
||||
"requires": {
|
||||
"@webassemblyjs/ast": "1.12.1",
|
||||
"@webassemblyjs/helper-api-error": "1.11.6",
|
||||
"@webassemblyjs/helper-wasm-bytecode": "1.11.6",
|
||||
"@webassemblyjs/ieee754": "1.11.6",
|
||||
"@webassemblyjs/leb128": "1.11.6",
|
||||
"@webassemblyjs/utf8": "1.11.6"
|
||||
}
|
||||
},
|
||||
"@webassemblyjs/wast-printer": {
|
||||
"version": "1.12.1",
|
||||
"resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
|
||||
"integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
|
||||
"requires": {
|
||||
"@webassemblyjs/ast": "1.12.1",
|
||||
"@xtuc/long": "4.2.2"
|
||||
}
|
||||
},
|
||||
"acorn": {
|
||||
"version": "8.10.0",
|
||||
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
|
||||
"integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw=="
|
||||
"version": "8.12.1",
|
||||
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
|
||||
"integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg=="
|
||||
},
|
||||
"enhanced-resolve": {
|
||||
"version": "5.17.1",
|
||||
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
|
||||
"integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
|
||||
"requires": {
|
||||
"graceful-fs": "^4.2.4",
|
||||
"tapable": "^2.2.0"
|
||||
}
|
||||
},
|
||||
"eslint-scope": {
|
||||
"version": "5.1.1",
|
||||
@ -16863,6 +16851,38 @@
|
||||
"version": "4.2.11",
|
||||
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
|
||||
"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
|
||||
},
|
||||
"terser": {
|
||||
"version": "5.31.6",
|
||||
"resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz",
|
||||
"integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==",
|
||||
"requires": {
|
||||
"@jridgewell/source-map": "^0.3.3",
|
||||
"acorn": "^8.8.2",
|
||||
"commander": "^2.20.0",
|
||||
"source-map-support": "~0.5.20"
|
||||
}
|
||||
},
|
||||
"terser-webpack-plugin": {
|
||||
"version": "5.3.10",
|
||||
"resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
|
||||
"integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
|
||||
"requires": {
|
||||
"@jridgewell/trace-mapping": "^0.3.20",
|
||||
"jest-worker": "^27.4.5",
|
||||
"schema-utils": "^3.1.1",
|
||||
"serialize-javascript": "^6.0.1",
|
||||
"terser": "^5.26.0"
|
||||
}
|
||||
},
|
||||
"watchpack": {
|
||||
"version": "2.4.2",
|
||||
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
|
||||
"integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
|
||||
"requires": {
|
||||
"glob-to-regexp": "^0.4.1",
|
||||
"graceful-fs": "^4.1.2"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user