INTEGRATION: CWS odff02 (1.18.54); FILE MERGED

2008/03/02 18:33:19 er 1.18.54.3: #i86514# move short error strings from globstr.src to compiler.src in preparation of support for error constants in formulas
2008/02/29 23:55:42 er 1.18.54.2: #i86514# prepare functions EUROCONVERT and NUMBERVALUE, suppressed
2008/02/29 21:13:29 er 1.18.54.1: #i86514# prepare functions UNICODE and UNICHAR, suppressed

1 files changed, 133 insertions, 116 deletions

diff --git a/sc/inc/compiler.hrc b/sc/inc/compiler.hrc
index 2ea5c144f22a..66902411a725 100644
--- a/sc/inc/compiler.hrc
+++ b/sc/inc/compiler.hrc
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: compiler.hrc,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: obo $ $Date: 2008-01-10 13:07:45 $
+ *  last change: $Author: kz $ $Date: 2008-03-07 11:08:33 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -62,126 +62,141 @@
 #define SC_OPCODE_ARRAY_CLOSE        20
 #define SC_OPCODE_ARRAY_ROW_SEP      21
 #define SC_OPCODE_ARRAY_COL_SEP      22     /* some convs use sep != col_sep */
-#define SC_OPCODE_END_DIV            23
+#define SC_OPCODE_STOP_DIV           23
+
+/*** error constants #... ***/
+#define SC_OPCODE_START_ERRORS       30
+#define SC_OPCODE_ERROR_NULL         30
+#define SC_OPCODE_ERROR_DIVZERO      31
+#define SC_OPCODE_ERROR_VALUE        32
+#define SC_OPCODE_ERROR_REF          33
+#define SC_OPCODE_ERROR_NAME         34
+#define SC_OPCODE_ERROR_NUM          35
+#define SC_OPCODE_ERROR_NA           36
+#define SC_OPCODE_STOP_ERRORS        37
 
 /*** Binary operators ***/
-#define SC_OPCODE_START_BIN_OP       25
-#define SC_OPCODE_ADD                25
-#define SC_OPCODE_SUB                26
-#define SC_OPCODE_MUL                27
-#define SC_OPCODE_DIV                28
-#define SC_OPCODE_AMPERSAND          29
-#define SC_OPCODE_POW                30
-#define SC_OPCODE_EQUAL              31
-#define SC_OPCODE_NOT_EQUAL          32
-#define SC_OPCODE_LESS               33
-#define SC_OPCODE_GREATER            34
-#define SC_OPCODE_LESS_EQUAL         35
-#define SC_OPCODE_GREATER_EQUAL      36
-#define SC_OPCODE_AND                37
-#define SC_OPCODE_OR                 38
-#define SC_OPCODE_INTERSECT          39
-#define SC_OPCODE_UNION              40
-#define SC_OPCODE_RANGE              41
-#define SC_OPCODE_END_BIN_OP         42
+#define SC_OPCODE_START_BIN_OP       40
+#define SC_OPCODE_ADD                40
+#define SC_OPCODE_SUB                41
+#define SC_OPCODE_MUL                42
+#define SC_OPCODE_DIV                43
+#define SC_OPCODE_AMPERSAND          44
+#define SC_OPCODE_POW                45
+#define SC_OPCODE_EQUAL              46
+#define SC_OPCODE_NOT_EQUAL          47
+#define SC_OPCODE_LESS               48
+#define SC_OPCODE_GREATER            49
+#define SC_OPCODE_LESS_EQUAL         50
+#define SC_OPCODE_GREATER_EQUAL      51
+#define SC_OPCODE_AND                52
+#define SC_OPCODE_OR                 53
+#define SC_OPCODE_INTERSECT          54
+#define SC_OPCODE_UNION              55
+#define SC_OPCODE_RANGE              56
+#define SC_OPCODE_STOP_BIN_OP        57
+
+/* NOTE: binary and unary operators must be in sequence for compiler! */
 
 /*** Unary operators ***/
-#define SC_OPCODE_START_UN_OP        45
-#define SC_OPCODE_NOT                45
-#define SC_OPCODE_NEG                46
-#define SC_OPCODE_NEG_SUB            47
-#define SC_OPCODE_END_UN_OP          48
+#define SC_OPCODE_START_UN_OP        60
+#define SC_OPCODE_NOT                60
+#define SC_OPCODE_NEG                61
+#define SC_OPCODE_NEG_SUB            62
+#define SC_OPCODE_STOP_UN_OP         63
 
 /*** Functions without parameters ***/
-#define SC_OPCODE_START_NO_PAR       50
-#define SC_OPCODE_PI                 50
-#define SC_OPCODE_RANDOM             51
-#define SC_OPCODE_TRUE               52
-#define SC_OPCODE_FALSE              53
-#define SC_OPCODE_GET_ACT_DATE       54
-#define SC_OPCODE_GET_ACT_TIME       55
-#define SC_OPCODE_NO_VALUE           56
-#define SC_OPCODE_CURRENT            57
-#define SC_OPCODE_END_NO_PAR         58
+#define SC_OPCODE_START_NO_PAR       65
+#define SC_OPCODE_PI                 65
+#define SC_OPCODE_RANDOM             66
+#define SC_OPCODE_TRUE               67
+#define SC_OPCODE_FALSE              68
+#define SC_OPCODE_GET_ACT_DATE       69
+#define SC_OPCODE_GET_ACT_TIME       70
+#define SC_OPCODE_NO_VALUE           71
+#define SC_OPCODE_CURRENT            72
+#define SC_OPCODE_STOP_NO_PAR        73
 
 /*** Functions with one parameter ***/
-#define SC_OPCODE_START_1_PAR        61
-#define SC_OPCODE_DEG                61     /* trigonometric */
-#define SC_OPCODE_RAD                62
-#define SC_OPCODE_SIN                63
-#define SC_OPCODE_COS                64
-#define SC_OPCODE_TAN                65
-#define SC_OPCODE_COT                66
-#define SC_OPCODE_ARC_SIN            67
-#define SC_OPCODE_ARC_COS            68
-#define SC_OPCODE_ARC_TAN            69
-#define SC_OPCODE_ARC_COT            70
-#define SC_OPCODE_SIN_HYP            71
-#define SC_OPCODE_COS_HYP            72
-#define SC_OPCODE_TAN_HYP            73
-#define SC_OPCODE_COT_HYP            74
-#define SC_OPCODE_ARC_SIN_HYP        75     /* transcendent */
-#define SC_OPCODE_ARC_COS_HYP        76
-#define SC_OPCODE_ARC_TAN_HYP        77
-#define SC_OPCODE_ARC_COT_HYP        78
-#define SC_OPCODE_EXP                79
-#define SC_OPCODE_LN                 80
-#define SC_OPCODE_SQRT               81
-#define SC_OPCODE_FACT               82
-#define SC_OPCODE_GET_YEAR           83     /* date and time */
-#define SC_OPCODE_GET_MONTH          84
-#define SC_OPCODE_GET_DAY            85
-#define SC_OPCODE_GET_HOUR           86
-#define SC_OPCODE_GET_MIN            87
-#define SC_OPCODE_GET_SEC            88
-#define SC_OPCODE_PLUS_MINUS         89     /* miscellaneous */
-#define SC_OPCODE_ABS                90
-#define SC_OPCODE_INT                91
-#define SC_OPCODE_PHI                92
-#define SC_OPCODE_GAUSS              93
-#define SC_OPCODE_IS_EMPTY           94     /* obtain type */
-#define SC_OPCODE_IS_STRING          95
-#define SC_OPCODE_IS_NON_STRING      96
-#define SC_OPCODE_IS_LOGICAL         97
-#define SC_OPCODE_TYPE               98
-#define SC_OPCODE_IS_REF             99
-#define SC_OPCODE_IS_VALUE          100
-#define SC_OPCODE_IS_FORMULA        101
-#define SC_OPCODE_IS_NV             102
-#define SC_OPCODE_IS_ERR            103
-#define SC_OPCODE_IS_ERROR          104
-#define SC_OPCODE_IS_EVEN           105
-#define SC_OPCODE_IS_ODD            106
-#define SC_OPCODE_N                 107
-#define SC_OPCODE_GET_DATE_VALUE    108     /* string functions */
-#define SC_OPCODE_GET_TIME_VALUE    109
-#define SC_OPCODE_CODE              110
-#define SC_OPCODE_TRIM              111
-#define SC_OPCODE_UPPER             112
-#define SC_OPCODE_PROPPER           113
-#define SC_OPCODE_LOWER             114
-#define SC_OPCODE_LEN               115
-#define SC_OPCODE_T                 116     /* miscellaneous, part 2 */
-#define SC_OPCODE_VALUE             117
-#define SC_OPCODE_CLEAN             118
-#define SC_OPCODE_CHAR              119
-#define SC_OPCODE_LOG10             120
-#define SC_OPCODE_EVEN              121
-#define SC_OPCODE_ODD               122
-#define SC_OPCODE_STD_NORM_DIST     123
-#define SC_OPCODE_FISHER            124
-#define SC_OPCODE_FISHER_INV        125
-#define SC_OPCODE_S_NORM_INV        126
-#define SC_OPCODE_GAMMA_LN          127
-#define SC_OPCODE_ERROR_TYPE        128
-#define SC_OPCODE_ERR_CELL          129
-#define SC_OPCODE_FORMULA           130
-#define SC_OPCODE_ARABIC            131
-#define SC_OPCODE_INFO              132
-#define SC_OPCODE_BAHTTEXT          133
-#define SC_OPCODE_JIS               134
-#define SC_OPCODE_ASC               135
-#define SC_OPCODE_END_1_PAR         136
+#define SC_OPCODE_START_1_PAR        80
+#define SC_OPCODE_DEG                80     /* trigonometric */
+#define SC_OPCODE_RAD                81
+#define SC_OPCODE_SIN                82
+#define SC_OPCODE_COS                83
+#define SC_OPCODE_TAN                84
+#define SC_OPCODE_COT                85
+#define SC_OPCODE_ARC_SIN            86
+#define SC_OPCODE_ARC_COS            87
+#define SC_OPCODE_ARC_TAN            88
+#define SC_OPCODE_ARC_COT            89
+#define SC_OPCODE_SIN_HYP            90
+#define SC_OPCODE_COS_HYP            91
+#define SC_OPCODE_TAN_HYP            92
+#define SC_OPCODE_COT_HYP            93
+#define SC_OPCODE_ARC_SIN_HYP        94     /* transcendent */
+#define SC_OPCODE_ARC_COS_HYP        95
+#define SC_OPCODE_ARC_TAN_HYP        96
+#define SC_OPCODE_ARC_COT_HYP        97
+#define SC_OPCODE_EXP                98
+#define SC_OPCODE_LN                 99
+#define SC_OPCODE_SQRT              100
+#define SC_OPCODE_FACT              101
+#define SC_OPCODE_GET_YEAR          102     /* date and time */
+#define SC_OPCODE_GET_MONTH         103
+#define SC_OPCODE_GET_DAY           104
+#define SC_OPCODE_GET_HOUR          105
+#define SC_OPCODE_GET_MIN           106
+#define SC_OPCODE_GET_SEC           107
+#define SC_OPCODE_PLUS_MINUS        108     /* miscellaneous */
+#define SC_OPCODE_ABS               109
+#define SC_OPCODE_INT               110
+#define SC_OPCODE_PHI               111
+#define SC_OPCODE_GAUSS             112
+#define SC_OPCODE_IS_EMPTY          113     /* obtain type */
+#define SC_OPCODE_IS_STRING         114
+#define SC_OPCODE_IS_NON_STRING     115
+#define SC_OPCODE_IS_LOGICAL        116
+#define SC_OPCODE_TYPE              117
+#define SC_OPCODE_IS_REF            118
+#define SC_OPCODE_IS_VALUE          119
+#define SC_OPCODE_IS_FORMULA        120
+#define SC_OPCODE_IS_NV             121
+#define SC_OPCODE_IS_ERR            122
+#define SC_OPCODE_IS_ERROR          123
+#define SC_OPCODE_IS_EVEN           124
+#define SC_OPCODE_IS_ODD            125
+#define SC_OPCODE_N                 126
+#define SC_OPCODE_GET_DATE_VALUE    127     /* string functions */
+#define SC_OPCODE_GET_TIME_VALUE    128
+#define SC_OPCODE_CODE              129
+#define SC_OPCODE_TRIM              130
+#define SC_OPCODE_UPPER             131
+#define SC_OPCODE_PROPPER           132
+#define SC_OPCODE_LOWER             133
+#define SC_OPCODE_LEN               134
+#define SC_OPCODE_T                 135     /* miscellaneous, part 21 */
+#define SC_OPCODE_VALUE             136
+#define SC_OPCODE_CLEAN             137
+#define SC_OPCODE_CHAR              138
+#define SC_OPCODE_LOG10             139
+#define SC_OPCODE_EVEN              140
+#define SC_OPCODE_ODD               141
+#define SC_OPCODE_STD_NORM_DIST     142
+#define SC_OPCODE_FISHER            143
+#define SC_OPCODE_FISHER_INV        144
+#define SC_OPCODE_S_NORM_INV        145
+#define SC_OPCODE_GAMMA_LN          146
+#define SC_OPCODE_ERROR_TYPE        147
+#define SC_OPCODE_ERR_CELL          148
+#define SC_OPCODE_FORMULA           149
+#define SC_OPCODE_ARABIC            150
+#define SC_OPCODE_INFO              151
+#define SC_OPCODE_BAHTTEXT          152
+#define SC_OPCODE_JIS               153
+#define SC_OPCODE_ASC               154
+#define SC_OPCODE_UNICODE           155
+#define SC_OPCODE_UNICHAR           156
+#define SC_OPCODE_STOP_1_PAR        157
 
 /*** Functions with more than one parameters ***/
 #define SC_OPCODE_START_2_PAR       201
@@ -375,9 +390,11 @@
 #define SC_OPCODE_INDIRECT_XL       388     /* See also INDIRECT for OOO variant */
 #define SC_OPCODE_ADDRESS_XL        389     /* See also ADRESS for OOO variant */
 #define SC_OPCODE_GET_PIVOT_DATA    390
-#define SC_OPCODE_END_2_PAR         391
+#define SC_OPCODE_EUROCONVERT       391
+#define SC_OPCODE_NUMBERVALUE       392
+#define SC_OPCODE_STOP_2_PAR        393
 
-#define SC_OPCODE_LAST_OPCODE_ID    390      /* last OpCode */
+#define SC_OPCODE_LAST_OPCODE_ID    392      /* last OpCode */
 
 /*** Interna ***/
 #define SC_OPCODE_INTERNAL_BEGIN   9995