--- linuxsampler/trunk/src/scriptvm/tree.h	2014/06/11 13:24:32	2619
+++ linuxsampler/trunk/src/scriptvm/tree.h	2017/05/30 17:20:02	3257
@@ -1,6 +1,6 @@
 /*                                                              -*- c++ -*-
  *
- * Copyright (c) 2014 Christian Schoenebeck and Andreas Persson
+ * Copyright (c) 2014 - 2017 Christian Schoenebeck and Andreas Persson
  *
  * http://www.linuxsampler.org
  *
@@ -20,6 +20,7 @@
 #include <iostream>
 #include <map>
 #include <set>
+#include <string.h> // for memset()
 #include "../common/global.h"
 #include "../common/Ref.h"
 #include "../common/ArrayList.h"
@@ -42,6 +43,7 @@
     Node();
     virtual ~Node();
     virtual void dump(int level = 0) = 0;
+    virtual bool isPolyphonic() const = 0;
     void printIndents(int n);
 };
 typedef Ref<Node> NodeRef;
@@ -62,6 +64,13 @@
 };
 typedef Ref<IntExpr,Node> IntExprRef;
 
+/*class IntArrayExpr : virtual public VMIntArrayExpr, virtual public Expression {
+public:
+    ExprType_t exprType() const { return INT_ARR_EXPR; }
+    String evalCastToStr();
+};
+typedef Ref<IntArrayExpr,Node> IntArrayExprRef;*/
+
 class StringExpr : virtual public VMStringExpr, virtual public Expression {
 public:
     ExprType_t exprType() const { return STRING_EXPR; }
@@ -77,6 +86,7 @@
     int evalInt();
     void dump(int level = 0);
     bool isConstExpr() const { return true; }
+    bool isPolyphonic() const { return false; }
 };
 typedef Ref<IntLiteral,Node> IntLiteralRef;
 
@@ -87,6 +97,7 @@
     bool isConstExpr() const { return true; }
     void dump(int level = 0);
     String evalStr() { return value; }
+    bool isPolyphonic() const { return false; }
 };
 typedef Ref<StringLiteral,Node> StringLiteralRef;
 
@@ -95,15 +106,18 @@
     std::vector<ExpressionRef> args;
     void add(ExpressionRef arg) { args.push_back(arg); }
     void dump(int level = 0);
-    int argsCount() const { return args.size(); }
+    int argsCount() const { return (int) args.size(); }
     VMExpr* arg(int i) { return (i >= 0 && i < argsCount()) ? &*args.at(i) : NULL; }
+    bool isPolyphonic() const;
 };
 typedef Ref<Args,Node> ArgsRef;
 
-class Variable : virtual public Expression {
+class Variable : virtual public VMVariable, virtual public Expression {
 public:
-    virtual bool isConstExpr() const { return bConst; }
+    bool isConstExpr() const OVERRIDE { return bConst; }
+    bool isAssignable() const OVERRIDE { return !bConst; }
     virtual void assign(Expression* expr) = 0;
+    void assignExpr(VMExpr* expr) OVERRIDE { Expression* e = dynamic_cast<Expression*>(expr); if (e) assign(e); }
 protected:
     Variable(ParserContext* ctx, int _memPos, bool _bConst)
         : context(ctx), memPos(_memPos), bConst(_bConst) {}
@@ -144,9 +158,10 @@
     VMIntRelPtr* ptr;
 public:
     BuiltInIntVariable(const String& name, VMIntRelPtr* ptr);
-    void assign(Expression* expr);
-    int evalInt();
-    void dump(int level = 0);
+    bool isAssignable() const OVERRIDE { return !ptr->readonly; }
+    void assign(Expression* expr) OVERRIDE;
+    int evalInt() OVERRIDE;
+    void dump(int level = 0) OVERRIDE;
 };
 typedef Ref<BuiltInIntVariable,Node> BuiltInIntVariableRef;
 
@@ -161,7 +176,7 @@
     ArrayList<int> values;
 public:
     IntArrayVariable(ParserContext* ctx, int size);
-    IntArrayVariable(ParserContext* ctx, int size, ArgsRef values);
+    IntArrayVariable(ParserContext* ctx, int size, ArgsRef values, bool _bConst = false);
     void assign(Expression* expr) {} // ignore scalar assignment
     String evalCastToStr() { return ""; } // ignore scalar cast to string
     ExprType_t exprType() const { return INT_ARR_EXPR; }
@@ -169,6 +184,7 @@
     virtual int evalIntElement(uint i);
     virtual void assignIntElement(uint i, int value);
     void dump(int level = 0);
+    bool isPolyphonic() const { return false; }
 protected:
     IntArrayVariable(ParserContext* ctx, bool bConst);
 };
@@ -181,6 +197,7 @@
     BuiltInIntArrayVariable(const String& name, VMInt8Array* array);
     int arraySize() const { return array->size; }
     int evalIntElement(uint i);
+    bool isAssignable() const OVERRIDE { return !array->readonly; }
     void assignIntElement(uint i, int value);
     void dump(int level = 0);
 };
@@ -203,6 +220,7 @@
     void assign(Expression* expr);
     String evalStr();
     void dump(int level = 0);
+    bool isPolyphonic() const { return false; }
 protected:
     StringVariable(ParserContext* ctx, bool bConst);
 };
@@ -226,6 +244,7 @@
 public:
     BinaryOp(ExpressionRef lhs, ExpressionRef rhs) : lhs(lhs), rhs(rhs) { }
     bool isConstExpr() const { return lhs->isConstExpr() && rhs->isConstExpr(); }
+    bool isPolyphonic() const { return lhs->isPolyphonic() || rhs->isPolyphonic(); }
 };
 typedef Ref<BinaryOp,Node> BinaryOpRef;
 
@@ -282,6 +301,7 @@
     NoOperation() : Statement() {}
     StmtType_t statementType() const { return STMT_LEAF; }
     void dump(int level = 0) {}
+    bool isPolyphonic() const { return false; }
 };
 typedef Ref<NoOperation,Node> NoOperationRef;
 
@@ -301,6 +321,7 @@
     void dump(int level = 0);
     StmtType_t statementType() const { return STMT_LIST; }
     virtual Statement* statement(uint i);
+    bool isPolyphonic() const;
 };
 typedef Ref<Statements,Node> StatementsRef;
 
@@ -311,6 +332,24 @@
     virtual Statements* branch(uint i) const = 0;
 };
 
+class DynamicVariableCall : public Variable, virtual public IntExpr, virtual public StringExpr {
+    VMDynVar* dynVar;
+    String varName;
+public:
+    DynamicVariableCall(const String& name, ParserContext* ctx, VMDynVar* v);
+    ExprType_t exprType() const OVERRIDE { return dynVar->exprType(); }
+    bool isConstExpr() const OVERRIDE { return dynVar->isConstExpr(); }
+    bool isAssignable() const OVERRIDE { return dynVar->isAssignable(); }
+    bool isPolyphonic() const OVERRIDE { return false; }
+    void assign(Expression* expr) OVERRIDE { dynVar->assignExpr(expr); }
+    VMIntArrayExpr* asIntArray() const OVERRIDE { return dynVar->asIntArray(); }
+    int evalInt() OVERRIDE;
+    String evalStr() OVERRIDE;
+    String evalCastToStr() OVERRIDE;
+    void dump(int level = 0) OVERRIDE;
+};
+typedef Ref<DynamicVariableCall,Node> DynamicVariableCallRef;
+
 class FunctionCall : virtual public LeafStatement, virtual public IntExpr, virtual public StringExpr {
     String functionName;
     ArgsRef args;
@@ -318,13 +357,15 @@
 public:
     FunctionCall(const char* function, ArgsRef args, VMFunction* fn) :
         functionName(function), args(args), fn(fn) { }
-    void dump(int level = 0);
-    StmtFlags_t exec();
-    int evalInt();
-    String evalStr();
-    bool isConstExpr() const { return false; }
-    ExprType_t exprType() const;
-    String evalCastToStr();
+    void dump(int level = 0) OVERRIDE;
+    StmtFlags_t exec() OVERRIDE;
+    int evalInt() OVERRIDE;
+    VMIntArrayExpr* asIntArray() const OVERRIDE;
+    String evalStr() OVERRIDE;
+    bool isConstExpr() const OVERRIDE { return false; }
+    ExprType_t exprType() const OVERRIDE;
+    String evalCastToStr() OVERRIDE;
+    bool isPolyphonic() const OVERRIDE { return args->isPolyphonic(); }
 protected:
     VMFnResult* execVMFn();
 };
@@ -332,17 +373,20 @@
 
 class EventHandler : virtual public Statements, virtual public VMEventHandler {
     StatementsRef statements;
+    bool usingPolyphonics;
 public:
     void dump(int level = 0);
     StmtFlags_t exec();
-    EventHandler(StatementsRef statements) { this->statements = statements; }
+    EventHandler(StatementsRef statements);
     Statement* statement(uint i) { return statements->statement(i); }
+    bool isPolyphonic() const { return usingPolyphonics; }
 };
 typedef Ref<EventHandler,Node> EventHandlerRef;
 
 class OnNote : public EventHandler {
 public:
     OnNote(StatementsRef statements) : EventHandler(statements) {}
+    VMEventHandlerType_t eventHandlerType() const { return VM_EVENT_HANDLER_NOTE; }
     String eventHandlerName() const { return "note"; }
 };
 typedef Ref<OnNote,Node> OnNoteRef;
@@ -350,6 +394,7 @@
 class OnInit : public EventHandler {
 public:
     OnInit(StatementsRef statements) : EventHandler(statements) {}
+    VMEventHandlerType_t eventHandlerType() const { return VM_EVENT_HANDLER_INIT; }
     String eventHandlerName() const { return "init"; }
 };
 typedef Ref<OnInit,Node> OnInitRef;
@@ -357,6 +402,7 @@
 class OnRelease : public EventHandler {
 public:
     OnRelease(StatementsRef statements) : EventHandler(statements) {}
+    VMEventHandlerType_t eventHandlerType() const { return VM_EVENT_HANDLER_RELEASE; }
     String eventHandlerName() const { return "release"; }
 };
 typedef Ref<OnRelease,Node> OnReleaseRef;
@@ -364,6 +410,7 @@
 class OnController : public EventHandler {
 public:
     OnController(StatementsRef statements) : EventHandler(statements) {}
+    VMEventHandlerType_t eventHandlerType() const { return VM_EVENT_HANDLER_CONTROLLER; }
     String eventHandlerName() const { return "controller"; }
 };
 typedef Ref<OnController,Node> OnControllerRef;
@@ -378,7 +425,8 @@
     int evalInt() { return 0; }
     EventHandler* eventHandlerByName(const String& name) const;
     EventHandler* eventHandler(uint index) const;
-    inline uint size() const { return args.size(); }
+    inline uint size() const { return (int) args.size(); }
+    bool isPolyphonic() const;
 };
 typedef Ref<EventHandlers,Node> EventHandlersRef;
 
@@ -390,6 +438,7 @@
     Assignment(VariableRef variable, ExpressionRef value);
     void dump(int level = 0);
     StmtFlags_t exec();
+    bool isPolyphonic() const { return (variable && variable->isPolyphonic()) || (value && value->isPolyphonic()); }
 };
 typedef Ref<Assignment,Node> AssignmentRef;
 
@@ -405,6 +454,7 @@
     void dump(int level = 0);
     int evalBranch();
     Statements* branch(uint i) const;
+    bool isPolyphonic() const;
 };
 typedef Ref<If,Node> IfRef;
 
@@ -428,6 +478,7 @@
     //void addBranch(IntExprRef from, IntExprRef to, StatementsRef statements);
     //void addBranch(CaseBranchRef branch);
     //void addBranches(CaseBranchesRef branches);
+    bool isPolyphonic() const;
 };
 typedef Ref<SelectCase,Node> SelectCaseRef;
 
@@ -441,6 +492,7 @@
     void dump(int level = 0);
     bool evalLoopStartCondition();
     Statements* statements() const;
+    bool isPolyphonic() const { return m_condition->isPolyphonic() || m_statements->isPolyphonic(); }
 };
 
 class Neg : public IntExpr {
@@ -450,6 +502,7 @@
     int evalInt() { return (expr) ? -expr->evalInt() : 0; }
     void dump(int level = 0);
     bool isConstExpr() const { return expr->isConstExpr(); }
+    bool isPolyphonic() const { return expr->isPolyphonic(); }
 };
 typedef Ref<Neg,Node> NegRef;
 
@@ -461,6 +514,7 @@
     String evalStr();
     void dump(int level = 0);
     bool isConstExpr() const;
+    bool isPolyphonic() const { return lhs->isPolyphonic() || rhs->isPolyphonic(); }
 };
 typedef Ref<ConcatString,Node> ConcatStringRef;
 
@@ -479,6 +533,7 @@
     int evalInt();
     void dump(int level = 0);
     bool isConstExpr() const;
+    bool isPolyphonic() const { return lhs->isPolyphonic() || rhs->isPolyphonic(); }
 private:
     IntExprRef lhs;
     IntExprRef rhs;
@@ -494,6 +549,14 @@
 };
 typedef Ref<Or,Node> OrRef;
 
+class BitwiseOr : virtual public BinaryOp, virtual public IntExpr {
+public:
+    BitwiseOr(IntExprRef lhs, IntExprRef rhs) : BinaryOp(lhs,rhs) {}
+    int evalInt();
+    void dump(int level = 0);
+};
+typedef Ref<BitwiseOr,Node> BitwiseOrRef;
+
 class And : virtual public BinaryOp, virtual public IntExpr {
 public:
     And(IntExprRef lhs, IntExprRef rhs) : BinaryOp(lhs,rhs) {}
@@ -502,6 +565,14 @@
 };
 typedef Ref<And,Node> AndRef;
 
+class BitwiseAnd : virtual public BinaryOp, virtual public IntExpr {
+public:
+    BitwiseAnd(IntExprRef lhs, IntExprRef rhs) : BinaryOp(lhs,rhs) {}
+    int evalInt();
+    void dump(int level = 0);
+};
+typedef Ref<BitwiseAnd,Node> BitwiseAndRef;
+
 class Not : virtual public IntExpr {
     IntExprRef expr;
 public:
@@ -509,9 +580,21 @@
     int evalInt() { return !expr->evalInt(); }
     void dump(int level = 0);
     bool isConstExpr() const { return expr->isConstExpr(); }
+    bool isPolyphonic() const { return expr->isPolyphonic(); }
 };
 typedef Ref<Not,Node> NotRef;
 
+class BitwiseNot : virtual public IntExpr {
+    IntExprRef expr;
+public:
+    BitwiseNot(IntExprRef expr) : expr(expr) {}
+    int evalInt() { return ~expr->evalInt(); }
+    void dump(int level = 0);
+    bool isConstExpr() const { return expr->isConstExpr(); }
+    bool isPolyphonic() const { return expr->isPolyphonic(); }
+};
+typedef Ref<BitwiseNot,Node> BitwiseNotRef;
+
 class ParserContext : public VMParserContext {
 public:
     struct Error {
@@ -530,6 +613,7 @@
     std::set<String> userPreprocessorConditions;
 
     std::map<String,VariableRef> vartable;
+    std::map<String,StatementsRef> userFnTable;
     int globalIntVarCount;
     int globalStrVarCount;
     int polyphonicIntVarCount;
@@ -561,8 +645,9 @@
     IntVariableRef globalIntVar(const String& name);
     StringVariableRef globalStrVar(const String& name);
     VariableRef variableByName(const String& name);
-    void addErr(int line, const char* txt);
-    void addWrn(int line, const char* txt);
+    StatementsRef userFunctionByName(const String& name);
+    void addErr(int firstLine, int lastLine, int firstColumn, int lastColumn, const char* txt);
+    void addWrn(int firstLine, int lastLine, int firstColumn, int lastColumn, const char* txt);
     void createScanner(std::istream* is);
     void destroyScanner();
     bool setPreprocessorCondition(const char* name);
@@ -576,6 +661,7 @@
     void registerBuiltInConstIntVariables(const std::map<String,int>& vars);
     void registerBuiltInIntVariables(const std::map<String,VMIntRelPtr*>& vars);
     void registerBuiltInIntArrayVariables(const std::map<String,VMInt8Array*>& vars);
+    void registerBuiltInDynVariables(const std::map<String,VMDynVar*>& vars);
 };
 
 class ExecContext : public VMExecContext {
@@ -595,9 +681,11 @@
     ArrayList<StackFrame> stack;
     int stackFrame;
     int suspendMicroseconds;
+    size_t instructionsCount;
 
     ExecContext() :
-        status(VM_EXEC_NOT_RUNNING), stackFrame(-1), suspendMicroseconds(0) {}
+        status(VM_EXEC_NOT_RUNNING), stackFrame(-1), suspendMicroseconds(0),
+        instructionsCount(0) {}
 
     virtual ~ExecContext() {}
 
@@ -625,6 +713,15 @@
     int suspensionTimeMicroseconds() const OVERRIDE {
         return suspendMicroseconds;
     }
+
+    void resetPolyphonicData() OVERRIDE {
+        if (polyphonicIntMemory.empty()) return;
+        memset(&polyphonicIntMemory[0], 0, polyphonicIntMemory.size() * sizeof(int));
+    }
+
+    size_t instructionsPerformed() const OVERRIDE {
+        return instructionsCount;
+    }
 };
 
 } // namespace LinuxSampler