Merge branch 'bkemain' into 'oramain'

Bkemain

See merge request rwp/rwloadsim!24

Author: bengsig

docs/EXPRESSION.md

@@ -13,11 +13,15 @@ The full list of operators in order of precedence are:
 |operator|description|type|
 |--------|-----------|----|
 |is [not] null|Check for (not) null|Post-fix, monadic|
-|- ! not|Arithmetic negative, two synonyms for boolean not|Prefix, monadic|
+|- ! not ~|Arithmetic negative, two synonyms for boolean not, bitwise not|Prefix, monadic|
 |* / %|Multiplication, division, and integer remainder|Dyadic|
 |+ -|Addition, subtraction|Dyadic|
+|<< >>|Bitwise left and right shift|Dyadic|
 |< <= > >= between/and|Inequality comparisons|Dyadic (between/and triadic)|
 |= != <>|Equality and two synonyms for non-equality|Dyadic|
+|&|Bitwise and|Dyadic|
+|^|Bitwise exclusive or|Dyadic|
+|&#124;|Bitwise or|Dyadic|
 |and|Boolean and|Dyadic|
 |or|Boolean or|Dyadic|
 |? :|Conditional expression|Triadic|
@@ -33,10 +37,12 @@ The rwloadsim language has three types of assignments:
 |operator|description|
 |--------|-----------|
 |:=|Ordinary assignment that assigns the value on the right side to the variable on the left|
-|+=|Increment assignment that adds the value on the right side to the variable on the left, which must be an integer or a double|
+|+= -=|Increment and decrement assignment that adds or subtracts the value on the right side to the variable on the left, which must be an integer or a double|
+|&#124;= &~=|Bitwise set and clear assignment that sets or clears the bits of the value on the right side in the variable on the left, which must be an integer|
 |&#124;&#124;=|Append assignment that appends the value on the right side to the variable on the left, which must be a string|
 
-Constants of type integer are sequences of digits, constants of type double 
+Constants of type integer are sequences of digits or 0x followed by a sequence
+of hexadicimal digits, constants of type double 
 contain a decimal point and or an exponent.
 A possible - in front of a number constant is never part of the constant, it
 is always the unary minus operator.
@@ -82,6 +88,10 @@ a := 1 + "2.9"; # will assign 3 to the integer as the
 # implicit conversion from string to integer stops at "."
 a += b+c; # increase the value of a by the sum of b and c
 
+integer bitval := 0;
+# set bit 5 in the variable bitval
+bitval |= 0x1<<4;
+
 # declare a string variable and assign some text to it
 string helloworld := "Hello";
 # append some more text to it

docs/NEWS31.md

@@ -1,3 +1,22 @@
+## News and updates for version 3.1.4 of the RWP\*Load Simulator
+
+The most important changes in version 3.1.4 are:
+
+### Bitwise operations and hexadecimal input
+
+Bitwise shift, and, or and exclusive or has been added as well as the ability
+to input hexadecimal integer constants.
+
+### New operators
+
+For bitwise operations, |= and &~= operators have been added to respectively set or clear bits
+in an integer.
+
+### Functions for database end-2-end tracing
+
+Two new functions, dbseconds() and ociseconds() have been added; they return respectively the
+time spent on the database side and on the clienside when executing select OCI calls.
+
 ## News and updates for version 3.1.3 of the RWP\*Load Simulator
 
 The most important changes in version 3.1.3 are:

docs/refman/concatenation.html

@@ -106,6 +106,8 @@ in the bin directory that calls rwloadsim with the -u option getting connping.rw
 the public directory.
 As a stand alone binary distribution, connping is an executable with the connping.rwl code
 embedded.
+.SH DOWNLOAD
+Please refer to https://github.com/oracle/rwloadsim for information about download and install.
 .SH COPYRIGHT
 Copyright \(co 2023 Oracle Corporation
 .br