From 0f9b6d0bc59e1fee607395689095fe76cdd444c6 Mon Sep 17 00:00:00 2001 From: smen Date: Fri, 4 Feb 2022 17:13:46 +0100 Subject: [PATCH] Patch level : nopatch Files correlati : velib07 Commento : --- src/include/alex.cpp | 3 +++ src/include/report.cpp | 12 +++++++++ src/include/report.h | 1 + src/ve/ve1800.cpp | 8 ++---- src/ve/ve18001.rep | 8 ++++-- src/ve/velib07.cpp | 58 +++++++++++++++++++++++++++++------------- 6 files changed, 65 insertions(+), 25 deletions(-) diff --git a/src/include/alex.cpp b/src/include/alex.cpp index 37dd01e0f..d68eb2e06 100755 --- a/src/include/alex.cpp +++ b/src/include/alex.cpp @@ -507,6 +507,9 @@ const TString_array& TAVM::get_user_words() int TAVM::compile_user_word(const char* w) { const TString_array& uw = get_user_words(); + if (strcmp(w, "#DAL") == 0) + int I = 1; + const int i = uw.find(w); return i > 0 ? i : 0; } diff --git a/src/include/report.cpp b/src/include/report.cpp index ad21e5ca4..3d7030a1d 100755 --- a/src/include/report.cpp +++ b/src/include/report.cpp @@ -2762,6 +2762,7 @@ bool TReport::set_usr_val(const TString& name, const TVariant& var) return ok; } + size_t TReport::get_usr_words(TString_array& words) const { const char* const name[] = @@ -2779,6 +2780,17 @@ size_t TReport::get_usr_words(TString_array& words) const return i; } +size_t TReport::add_usr_words(TString_array& words, const char* const names[]) const +{ + TReport::get_usr_words(words); + + const int first_msg = words.items(); // Calcola il primo numero disponibile + for (size_t i = 0; names[i] != NULL; i++) + words.add(names[i]); + + return first_msg; +} + static void do_show(TReport_field& rf, void* jolly) { rf.set_draw_hidden(jolly == NULL); } diff --git a/src/include/report.h b/src/include/report.h index dcb81d724..c2d8e8ddd 100755 --- a/src/include/report.h +++ b/src/include/report.h @@ -570,6 +570,7 @@ class TReport : public TAlex_virtual_machine protected: virtual const char* class_name() const { return "Report"; } virtual size_t get_usr_words(TString_array& words) const; + virtual size_t add_usr_words(TString_array& words, const char* const names[]) const; virtual bool execute_usr_word(unsigned int opcode, TVariant_stack& stack); virtual bool get_usr_val(const TString& name, TVariant& var) const; virtual bool set_usr_val(const TString& name, const TVariant& var); diff --git a/src/ve/ve1800.cpp b/src/ve/ve1800.cpp index 62c101f5e..42647d93d 100644 --- a/src/ve/ve1800.cpp +++ b/src/ve/ve1800.cpp @@ -64,12 +64,8 @@ void TListaFido_app::main_loop() TDate dal = m.get_date(F_DADATA); TDate al = m.get_date(F_ADATA); - if (dal.ok()) - report.set_datafidodal(dal); - - if (al.ok()) - report.set_datafidoal(al); - + report.set_datafidodal(dal); + report.set_datafidoal(al); book.add(report); if (book.pages() > 0) if (k == K_VISUALIZE) diff --git a/src/ve/ve18001.rep b/src/ve/ve18001.rep index f21d4e642..196d6dcd5 100644 --- a/src/ve/ve18001.rep +++ b/src/ve/ve18001.rep @@ -9,7 +9,7 @@ #SYSTEM.RAGSOC