Merge branch 'master' into clean_events

diff --cc src/instr/instr_paje_trace.cpp
Simple merge

diff --cc src/instr/instr_paje_types.cpp
Simple merge

diff --cc src/instr/instr_private.h
index 78e8aec,9d10c4b..64e6080
--- 1/src/instr/instr_private.h
--- 2/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@@ -123,11 -123,38 +123,27 @@@ class PajeEvent 
    virtual ~PajeEvent();
  };
  
 -class DefineContainerEvent : public PajeEvent
 -{
 -  public:
 -  type_t type;
 -  void print() override;
 -  DefineContainerEvent(type_t);
 -};
 -
 -//--------------------------------------------------
 -
 -
  //--------------------------------------------------
  
+ class DefineVariableTypeEvent : public PajeEvent
+ {
+   public:
+   type_t type;
+    DefineVariableTypeEvent(type_t type);
+    void print() override;
+ };
+ //--------------------------------------------------
+ 
+ class DefineStateTypeEvent : public PajeEvent  {
+   type_t type;
+   public:
+   DefineStateTypeEvent(type_t type);
+   void print() override;
+ };
+ 
  class DefineEventTypeEvent : public PajeEvent  {
    type_t type;
-   public: 
+   public:
    DefineEventTypeEvent(type_t type);
    void print() override;
  };