/[svn]/linuxsampler/trunk/src/scriptvm/tree.h
ViewVC logotype

Diff of /linuxsampler/trunk/src/scriptvm/tree.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3260 by schoenebeck, Wed May 31 21:07:44 2017 UTC revision 3285 by schoenebeck, Thu Jun 22 10:45:38 2017 UTC
# Line 620  public: Line 620  public:
620      std::vector<ParserIssue> vErrors;      std::vector<ParserIssue> vErrors;
621      std::vector<ParserIssue> vWarnings;      std::vector<ParserIssue> vWarnings;
622      std::vector<ParserIssue> vIssues;      std::vector<ParserIssue> vIssues;
623        std::vector<CodeBlock>   vPreprocessorComments;
624    
625      std::set<String> builtinPreprocessorConditions;      std::set<String> builtinPreprocessorConditions;
626      std::set<String> userPreprocessorConditions;      std::set<String> userPreprocessorConditions;
# Line 660  public: Line 661  public:
661      StatementsRef userFunctionByName(const String& name);      StatementsRef userFunctionByName(const String& name);
662      void addErr(int firstLine, int lastLine, int firstColumn, int lastColumn, const char* txt);      void addErr(int firstLine, int lastLine, int firstColumn, int lastColumn, const char* txt);
663      void addWrn(int firstLine, int lastLine, int firstColumn, int lastColumn, const char* txt);      void addWrn(int firstLine, int lastLine, int firstColumn, int lastColumn, const char* txt);
664        void addPreprocessorComment(int firstLine, int lastLine, int firstColumn, int lastColumn);
665      void createScanner(std::istream* is);      void createScanner(std::istream* is);
666      void destroyScanner();      void destroyScanner();
667      bool setPreprocessorCondition(const char* name);      bool setPreprocessorCondition(const char* name);
# Line 668  public: Line 670  public:
670      std::vector<ParserIssue> issues() const OVERRIDE;      std::vector<ParserIssue> issues() const OVERRIDE;
671      std::vector<ParserIssue> errors() const OVERRIDE;      std::vector<ParserIssue> errors() const OVERRIDE;
672      std::vector<ParserIssue> warnings() const OVERRIDE;      std::vector<ParserIssue> warnings() const OVERRIDE;
673        std::vector<CodeBlock> preprocessorComments() const OVERRIDE;
674      VMEventHandler* eventHandler(uint index) OVERRIDE;      VMEventHandler* eventHandler(uint index) OVERRIDE;
675      VMEventHandler* eventHandlerByName(const String& name) OVERRIDE;      VMEventHandler* eventHandlerByName(const String& name) OVERRIDE;
676      void registerBuiltInConstIntVariables(const std::map<String,int>& vars);      void registerBuiltInConstIntVariables(const std::map<String,int>& vars);
# Line 690  public: Line 693  public:
693    
694      ArrayList<int> polyphonicIntMemory;      ArrayList<int> polyphonicIntMemory;
695      VMExecStatus_t status;      VMExecStatus_t status;
696        StmtFlags_t flags;
697      ArrayList<StackFrame> stack;      ArrayList<StackFrame> stack;
698      int stackFrame;      int stackFrame;
699      int suspendMicroseconds;      int suspendMicroseconds;
700      size_t instructionsCount;      size_t instructionsCount;
701    
702      ExecContext() :      ExecContext() :
703          status(VM_EXEC_NOT_RUNNING), stackFrame(-1), suspendMicroseconds(0),          status(VM_EXEC_NOT_RUNNING), flags(STMT_SUCCESS), stackFrame(-1),
704          instructionsCount(0) {}          suspendMicroseconds(0), instructionsCount(0) {}
705    
706      virtual ~ExecContext() {}      virtual ~ExecContext() {}
707    
# Line 720  public: Line 724  public:
724          stack[0].statement = NULL;          stack[0].statement = NULL;
725          stack[0].subindex  = -1;          stack[0].subindex  = -1;
726          stackFrame = -1;          stackFrame = -1;
727            flags = STMT_SUCCESS;
728      }      }
729    
730      int suspensionTimeMicroseconds() const OVERRIDE {      int suspensionTimeMicroseconds() const OVERRIDE {
# Line 734  public: Line 739  public:
739      size_t instructionsPerformed() const OVERRIDE {      size_t instructionsPerformed() const OVERRIDE {
740          return instructionsCount;          return instructionsCount;
741      }      }
742    
743        void signalAbort() OVERRIDE {
744            flags = StmtFlags_t(flags | STMT_ABORT_SIGNALLED);
745        }
746  };  };
747    
748  } // namespace LinuxSampler  } // namespace LinuxSampler
Legend:
Removed from v.3260  
changed lines
  Added in v.3285
  ViewVC Help
Powered by ViewVC