Merge branch 'jfkdev' into 'bkedev'

Draft merge trig into others

See merge request rwp/rwloadsim!2

Author: bengsig

man/man1rwl/expression.1rwl

@@ -315,6 +315,12 @@ If p is omitted, return e raised to the power of a.
 .B log(l,a) log(a)
 Return the logarithm of base l, respectively e, of the argument a.
 .TP
+.B sin(a) cos(a)
+Return the sine or cosine of argument a degrees.
+.TP
+.B atan2(b,a)
+Return the angle in degrees between the a-coordinate and b-coordinate for the quadrant.
+.TP
 .B lengthb(s)
 Return the length in bytes of the string s.
 .TP

src/rwl.h

@@ -13,7 +13,9 @@
  *
  * History
  *
- * bengsig   9-nov-2023 - Increase RWL_MAX_VAR
+ * johnkenn 02-nov-2023 - trignometry sin, cos, atan2
+* bengsig   9-nov-2023 - Increase RWL_MAX_VAR
+* johnkenn 02-nov-2023 - trignometry sin, cos, atan2
  * bengsig   3-oct-2023 - Now development for 3.1.1
  * bengsig   2-oct-2023 - Releasing 3.1.0 
  * bengsig  22-sep-2023 - ampersand fixes
@@ -1026,6 +1028,7 @@ struct rwl_main
 #define RWL_P4_SQLLOGFILE    0x00000008 // $sqllogging to real file that we must close
 #define RWL_P4_AMPERSAND     0x00000010 // ampersand replacement in embedded sql is on
 #define RWL_P4_URLERRORON    0x00000020 // do not turn of error URL
+#define RWL_P4_TRIGRAD       0x00000040 // Make triginometry functions use gradients
   FILE *sqllogfile;
 
   int userexit; // value for user exit
@@ -1355,6 +1358,9 @@ enum rwl_stack_t
 , RWL_STACK_RUNSECONDS /* runseconds function */
 , RWL_STACK_EPOCHSECONDS /* epochseconds function */
 , RWL_STACK_SQRT /* sqrt() function */
+, RWL_STACK_SIN /* sin() function */
+, RWL_STACK_COS /* cos() function */
+, RWL_STACK_ATAN2 /* atan2(y,x) function */
 , RWL_STACK_LENGTHB /* lengthb() function */
 , RWL_STACK_SUBSTRB2 /* substrb(s,p) function */
 , RWL_STACK_SUBSTRB3 /* substrb(s,p,l) function */

src/rwlexprcomp.c

@@ -19,6 +19,7 @@
  *
  * History
  *
+ * johnkenn 02-nov-2023 - Add sin and cos 
  * bengsig  19-jul-2023 - Fix constants rwl_null etc.
  * bengsig  17-jul-2023 - % works on double
  * bengsig  10-jul-2023 - ceil, trunc, floor functions
@@ -804,6 +805,7 @@ rwl_estack *rwlexprfinish(rwl_main *rwm)
 	case RWL_STACK_NORMALRANDOM:
 	case RWL_STACK_ERLANGK:
 	case RWL_STACK_EXPB:
+	case RWL_STACK_ATAN2:
 	case RWL_STACK_LOGB:
 	  rwlasrti(2,"logb");
 	  estk[i].evaltype = tstk[i] = RWL_TYPE_DBL;
@@ -961,6 +963,8 @@ rwl_estack *rwlexprfinish(rwl_main *rwm)
 	case RWL_STACK_FLOOR:
 	case RWL_STACK_ROUND:
 	case RWL_STACK_SQRT:
+	case RWL_STACK_SIN:
+	case RWL_STACK_COS:
 	case RWL_STACK_ERLANG:
 	case RWL_STACK_ERLANG2:
 	  rwlasrti(1,"doublfunc");

src/rwlexpreval.c

@@ -14,6 +14,7 @@
  *
  * History
  *
+ * johnkenn 06-nov-2023 - trigonometry sin, cos, atan2
  * bengsig  25-sep-2023 - fix if doublevar then
  * bengsig  19-jul-2023 - assign empty or only space to int/dbl is NULL
  * bengsig  17-jul-2023 - % works on double
@@ -234,6 +235,9 @@ void rwlexpreval ( rwl_estack *stk , rwl_location *loc , rwl_xeqenv *xev , rwl_v
       case RWL_STACK_FLOOR:
       case RWL_STACK_CEIL:
       case RWL_STACK_TRUNC:
+	  case RWL_STACK_SIN:
+	  case RWL_STACK_COS:
+	  case RWL_STACK_ATAN2:
       break;
 
       case RWL_STACK_END:
@@ -460,6 +464,18 @@ void rwlexpreval ( rwl_estack *stk , rwl_location *loc , rwl_xeqenv *xev , rwl_v
 	  fprintf(stderr," SQRT");
 	break;
 
+	case RWL_STACK_SIN:
+	  fprintf(stderr," SIN");
+	break;
+
+	case RWL_STACK_COS:
+	  fprintf(stderr," COS");
+	break;
+
+	case RWL_STACK_ATAN2:
+	  fprintf(stderr, "ATAN2");
+	break;
+
 	case RWL_STACK_ERLANG:
 	  fprintf(stderr," ERLANG");
 	break;
@@ -2690,6 +2706,25 @@ void rwlexpreval ( rwl_estack *stk , rwl_location *loc , rwl_xeqenv *xev , rwl_v
 	goto finish_two_math;
 	break;
 
+      case RWL_STACK_ATAN2:
+        if (i<2) goto stack2short;
+	if (tainted || skip) goto pop_two;
+	if (bit(xev->rwm->m4flags, RWL_P4_TRIGRAD))
+	{
+		resdval = atan2(cstak[i-2].dval, cstak[i-1].dval);	
+	}
+	else
+	{
+		resdval = (atan2(cstak[i-2].dval, cstak[i-1].dval) * (180.0 / M_PI));
+	}
+	resival = (sb8)round(resdval);
+	if (bit(xev->tflags,RWL_THR_DEVAL))
+	  rwldebugcode(xev->rwm, loc,  "at %d: atan2(%.2f,%.2f)=%.2f", i, cstak[i-2].dval
+		  , cstak[i-1].dval,resdval);
+	rtyp = RWL_TYPE_DBL;
+	goto finish_two_math;
+	break;
+
       case RWL_STACK_CEIL:
         if (i<1) goto stack1short;
 	if (tainted || skip) goto pop_one;
@@ -2750,6 +2785,44 @@ void rwlexpreval ( rwl_estack *stk , rwl_location *loc , rwl_xeqenv *xev , rwl_v
 	goto finish_one_math;
 	break;
 
+	  case RWL_STACK_SIN:
+        if (i<1) goto stack1short;
+	if (tainted || skip) goto pop_one;
+	if (bit(xev->rwm->m4flags, RWL_P4_TRIGRAD))
+	{
+		resdval = sin(cstak[i-1].dval);
+	}
+	else
+	{
+		resdval = sin(cstak[i-1].dval) * (M_PI / 180.0);
+	}
+	resival = (sb8)round(resdval);
+	if (bit(xev->tflags,RWL_THR_DEVAL))
+	  rwldebugcode(xev->rwm, loc,  "at %d: sin(%.2f) = %.2f", i, cstak[i-1].dval, resdval);
+	rtyp = RWL_TYPE_DBL;
+	goto finish_one_math;
+	break;
+
+	  case RWL_STACK_COS:
+        if (i<1) goto stack1short;
+	if (tainted || skip) goto pop_one;
+
+	if (bit(xev->rwm->m4flags, RWL_P4_TRIGRAD))
+	{
+		resdval = cos(cstak[i-1].dval);
+	}
+	else
+	{
+		resdval = cos(cstak[i-1].dval) * (M_PI / 180.0);
+	}
+	resival = (sb8)round(resdval);
+	if (bit(xev->tflags,RWL_THR_DEVAL))
+	  rwldebugcode(xev->rwm, loc,  "at %d: cos(%.2f) = %.2f", i, cstak[i-1].dval, resdval);
+	rtyp = RWL_TYPE_DBL;
+	goto finish_one_math;
+	break;
+
+
       case RWL_STACK_ERLANG:
 	/*
 	  Assuming ran is uniform random number generator

src/rwllexer.l

@@ -11,6 +11,7 @@
  *
  * History
  *
+ * johnkenn 02-nov-2023 - $trigonometry:degrees and $trigonometry:radians directives
  * bengsig  21-sep-2023 - $errordetail:on directive
  * bengsig  13-sep-2023 - ampersand replacement
  * bengsig   6-sep-2023 - sql logging
@@ -443,6 +444,8 @@
 "nostatistics"		if (!rwm->ifdirbit) return RWL_T_NOSTATISTICS;
   /*LEXTAG:RWL_T_SQRT*/
 "sqrt"			if (!rwm->ifdirbit) return RWL_T_SQRT;
+"sin"			if (!rwm->ifdirbit) return RWL_T_SIN;
+"cos"			if (!rwm->ifdirbit) return RWL_T_COS;
   /*LEXTAG:RWL_T_INSTRB*/
 "instr"		{
 			  rwlerror(rwm, RWL_ERROR_CURRENTLY_AS, "instr", "instrb");
@@ -653,19 +656,8 @@
 #endif
 			  if (!rwm->ifdirbit) return RWL_T_QUERYNOTIFICATION;
 		        }
-
-"sin" |
-"cos"			{
-			  rwlerror(rwm, RWL_ERROR_NOT_YET_IMPL, yytext);
-			  // return something so compilation continues
-    			  if (!rwm->ifdirbit) return RWL_T_ERLANG;
-		        }
-
-"atan2" 		{
-			  rwlerror(rwm, RWL_ERROR_NOT_YET_IMPL, yytext);
-			  // return something so compilation continues
-    			  if (!rwm->ifdirbit) return RWL_T_UNIFORM;
-		        }
+  /*LEXTAG:RWL_T_ATAN2*/
+"atan2" 	if (!rwm->ifdirbit) return RWL_T_ATAN2;
 
 "|"  |
 "&"  |
@@ -1581,7 +1573,12 @@
 			    rwm->sqllogfile = 0;
 			  }
 			}
-
+\$trigonometry:radian[s]?	{
+			 if (!rwm->ifdirbit) bis(rwm->m4flags, RWL_P4_TRIGRAD);
+}
+\$trigonometry:degree[s]?	{
+			 if (!rwm->ifdirbit) bic(rwm->m4flags, RWL_P4_TRIGRAD);	 
+}
 \$ |
 \$[^ \t\r\n]	{ // bad directive
 		  char idbuf[100], c;

src/rwlmisc.c

@@ -4485,7 +4485,7 @@ void rwlpfeng(rwl_main *rwm
 ub4 rwldebugconv(rwl_main * rwm
 , text * arg)
 {
-  // Mapping strcut for for the debug names
+  // Mapping struct for for the debug names
   struct rwl_debugmap
   {
   text * name;
@@ -4515,7 +4515,7 @@ ub4 rwldebugconv(rwl_main * rwm
 
   while (token != NULL)
   {
-    // Get the length of the token and convert token to uppercase
+    // Get the length of the token and convert token to lowercase
     size_t token_len = rwlstrlen((char *)token);
     for (index = 0; index < token_len; index++)
     {

src/rwlparser.y

@@ -11,6 +11,7 @@
  *
  * History
  *
+ * johnkenn 06-nov-2023 - trigonometry sin, cos, atan2
  * bengsig  25-sep-2023 - ampersand bug fix
  * bengsig  20-sep-2023 - list iterator loop
  * bengsig  12-sep-2023 - Ampersand replacement
@@ -174,6 +175,7 @@ static const rwl_yt2txt rwlyt2[] =
   , {"RWL_T_ASNPLUS", "'+='"}
   , {"RWL_T_ASSIGN", "':='"}
   , {"RWL_T_AT", "'at'"}
+  , {"RWL_T_ATAN2", "'atan2'"}
   , {"RWL_T_BEGIN", "'begin'"}
   , {"RWL_T_BETWEEN", "'between'"}
   , {"RWL_T_BIND", "'bind'"}
@@ -188,6 +190,7 @@ static const rwl_yt2txt rwlyt2[] =
   , {"RWL_T_CONNECTIONCLASS", "'connectionclass'"}
   , {"RWL_T_CONNECTIONPOOL", "'connectionpool'"}
   , {"RWL_T_COUNT", "'count'"}
+  , {"RWL_T_COS", "'cos'"}
   , {"RWL_T_CURSORCACHE", "'cursorcache'"}
   , {"RWL_T_DATABASE", "'database'"}
   , {"RWL_T_DATE", "'date'"}
@@ -285,6 +288,7 @@ static const rwl_yt2txt rwlyt2[] =
   , {"RWL_T_SESSIONPOOL", "'sessionpool'"}
   , {"RWL_T_SHARDKEY", "'shardkey'"}
   , {"RWL_T_SHIFT", "'shift'"}
+  , {"RWL_T_SIN", "'sin'"}
   , {"RWL_T_SPRINTF", "'sprintf'"}
   , {"RWL_T_SQL", "'sql'"}
   , {"RWL_T_SQL_ID", "'sql_id'"}
@@ -491,6 +495,7 @@ rwlcomp(rwlparser_y, RWL_GCCFLAGS)
 %token RWL_T_STRING_CONST RWL_T_IDENTIFIER RWL_T_INTEGER_CONST RWL_T_DOUBLE_CONST RWL_T_PRINTF
 %token RWL_T_PIPEFROM RWL_T_PIPETO RWL_T_RSHIFTASSIGN RWL_T_GLOBAL RWL_T_QUERYNOTIFICATION
 %token RWL_T_NORMALRANDOM RWL_T_STATISTICSONLY RWL_T_CEIL RWL_T_TRUNC RWL_T_FLOOR RWL_T_LOBPREFETCH
+%token RWL_T_SIN RWL_T_COS RWL_T_ATAN2
 
 // standard order of association
 %left RWL_T_CONCAT
@@ -1582,6 +1587,9 @@ identifier_or_constant:
 	| RWL_T_FLOOR '(' expression ')' { rwlexprpush0(rwm,RWL_STACK_FLOOR); }
 	| RWL_T_ROUND '(' expression ')' { rwlexprpush0(rwm,RWL_STACK_ROUND); }
 	| RWL_T_SQRT '(' expression ')' { rwlexprpush0(rwm,RWL_STACK_SQRT); }
+	| RWL_T_SIN '(' expression ')' { rwlexprpush0(rwm,RWL_STACK_SIN); }
+	| RWL_T_COS '(' expression ')' { rwlexprpush0(rwm,RWL_STACK_COS); }
+	| RWL_T_ATAN2 '(' expression ',' expression ')' { rwlexprpush0(rwm,RWL_STACK_ATAN2); }
 	| RWL_T_LENGTHB '(' concatenation ')' { rwlexprpush0(rwm,RWL_STACK_LENGTHB); }
 	| RWL_T_INSTRB '(' concatenation ',' concatenation')'
 			{ rwlexprpush0(rwm,RWL_STACK_INSTRB2); }

test/362.rwl

@@ -0,0 +1,35 @@
+double val := 178, x, y;
+
+double atan_x := -7, atan_y := 7, atan_res;
+x := sin(val);
+y := cos(val);
+atan_res := atan2(atan_y, atan_x);
+printline x, y, atan_res;
+
+$trigonometry:degree
+
+x := sin(val);
+y := cos(val);
+atan_res := atan2(atan_y, atan_x);
+printline x, y, atan_res;
+
+$trigonometry:radian
+
+x := sin(val);
+y := cos(val);
+atan_res := atan2(atan_y, atan_x);
+printline x, y, atan_res;
+
+$trigonometry:degrees
+
+x := sin(val);
+y := cos(val);
+atan_res := atan2(atan_y, atan_x);
+printline x, y, atan_res;
+
+$trigonometry:radians
+
+x := sin(val);
+y := cos(val);
+atan_res := atan2(atan_y, atan_x);
+printline x, y, atan_res;