Newer
Older
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
import from LibItsGeoNetworking_TypesAndValues all;
import from LibItsGeoNetworking_Pixits all;
+ import from LibItsGeoNetworking_EncdecDeclarations all;
group geoNwPrimitivesTemplates {
@@ -107,7 +109,7 @@
geoUnicast := {
gnAddress := p_destinationGnAddr,
lifetime := c_lifetime,
- trafficClass := m_trafficClass,
+ trafficClass := valueof(m_trafficClass),
payload := { decodedPayload := omit, rawPayload := ''O} // do not use f_adaptPayload_m here
}
}
@@ -184,7 +186,7 @@
geoBroadcast := {
shape := p_geoArea.shape,
lifetime := c_lifetime,
- trafficClass := m_trafficClass,
+ trafficClass := valueof(m_trafficClass),
reserved := c_uInt24Zero,
area := p_geoArea.area,
payload := { decodedPayload := omit, rawPayload := ''O} // do not use f_adaptPayload_m here
@@ -244,7 +246,7 @@
geoAnycast := {
shape := p_geoArea.shape,
lifetime := c_lifetime,
- trafficClass := m_trafficClass,
+ trafficClass := valueof(m_trafficClass),
reserved := c_uInt24Zero,
area := p_geoArea.area,
payload := { decodedPayload := omit, rawPayload := ''O} // do not use f_adaptPayload_m here
@@ -286,7 +288,7 @@
*/
template (value) UtGnTrigger m_generateShbMessage := {
shb := {
- trafficClass := m_trafficClass,
+ trafficClass := valueof(m_trafficClass),
payload := { decodedPayload := omit, rawPayload := ''O} // do not use f_adaptPayload_m here
}
}
@@ -324,7 +326,7 @@
tsb := {
nbHops := 10,
lifetime := c_lifetime,
- trafficClass := m_trafficClass,
+ trafficClass := valueof(m_trafficClass),
payload := { decodedPayload := omit, rawPayload := ''O} // do not use f_adaptPayload_m here
}
}
@@ -374,7 +376,7 @@
template (value) BeaconHeader p_beaconHeader
) := {
startBeaconing := {
- beaconPacket := m_geoNwPdu(m_geoNwBeaconPacket(p_beaconHeader.srcPosVector), -, c_hopLimit1)
+ beaconPacket := m_geoNwPdu(valueof(m_geoNwBeaconPacket(valueof(p_beaconHeader.srcPosVector))), -, c_hopLimit1)
}
}
@@ -417,7 +419,7 @@
integer p_numberOfNeighbour
) := {
startBeaconingMultipleNeighbour := {
- beaconPacket := m_geoNwPdu(m_geoNwBeaconPacket(p_beaconHeader.srcPosVector), -, c_hopLimit1),
+ beaconPacket := m_geoNwPdu(valueof(m_geoNwBeaconPacket(valueof(p_beaconHeader.srcPosVector))), -, c_hopLimit1),
numberOfNeighbour := p_numberOfNeighbour
}
}
@@ -537,11 +539,11 @@
in template (value) CommonHeader p_commonHeader,
in template (value) ExtendedHeader p_extHeader
) := {
- packet := {
+ packet := valueof({
commonHeader := p_commonHeader,
extendedHeader := p_extHeader,
payload := f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))
- },
+ }),
securedMsg := omit
}
@@ -575,7 +577,7 @@
in template (value) octetstring p_payload
) modifies m_geoNwPacket := {
packet := {
- payload := f_adaptPayload_m(p_payload)
+ payload := valueof(f_adaptPayload_m(p_payload))
}
}
@@ -621,7 +623,9 @@
*
* @see mw_geoNwPacket
*/
- template GeoNetworkingPacket mw_geoNwPduAnyPayload(
+//FIXME RGY template restriction can be the same as its base template: template is not used currently
+// template GeoNetworkingPacket mw_geoNwPduAnyPayload(
+ template(present) GeoNetworkingPacket mw_geoNwPduAnyPayload(
in template (present) CommonHeader p_commonHeader,
in template (present) ExtendedHeader p_extHeader
) modifies mw_geoNwPacket := {
@@ -638,7 +642,9 @@
*
* @see mw_geoNwPacket
*/
- template GeoNetworkingPacket mw_geoNwPduWithOctetstringPayload(
+//FIXME RGY template restriction can be the same as its base template: template is not used currently
+// template GeoNetworkingPacket mw_geoNwPduWithOctetstringPayload(
+ template(present) GeoNetworkingPacket mw_geoNwPduWithOctetstringPayload(
in template (present) CommonHeader p_commonHeader,
in template (present) ExtendedHeader p_extHeader,
in template (present) octetstring p_payload
@@ -656,7 +662,9 @@
*
* @see mw_geoNwPacket
*/
- template GeoNetworkingPacket mw_geoNwPduWithPayload(
+//FIXME RGY template restriction can be the same as its base template: used in TC_SEC_ITSS_SND_CAM_02_01_BV only, where is called with parameters
+// template GeoNetworkingPacket mw_geoNwPduWithPayload(
+ template(present) GeoNetworkingPacket mw_geoNwPduWithPayload(
in template (present) CommonHeader p_commonHeader,
in template (present) ExtendedHeader p_extHeader,
in template (present) Payload p_payload
@@ -714,18 +722,18 @@
in template (value) UInt8 p_hopLimit := c_defaultHopLimit,
in template (value) TrafficClass p_trafficClass := m_trafficClass
) := {
- commonHeader := m_commonHeader(
+ commonHeader := valueof(m_commonHeader(
PX_GN_UPPER_LAYER,
m_geoUnicastHeaderType,
p_trafficClass,
p_hopLimit
- ),
- extendedHeader := m_geoUnicastHeader(
+ )),
+ extendedHeader := valueof(m_geoUnicastHeader(
p_sourceLongPosVec,
p_destinationShortPosVec,
p_seqNumber
- ),
- payload := f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))
+ )),
+ payload := valueof(f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD")))
}
/**
@@ -825,18 +833,18 @@
in template (value) UInt8 p_hopLimit := c_defaultHopLimit,
in template (value) TrafficClass p_trafficClass := m_trafficClass
) := {
- commonHeader := m_commonHeader(
+ commonHeader := valueof(m_commonHeader(
PX_GN_UPPER_LAYER,
- m_geoAnycastHeaderType(p_anycastArea.geoAnycastSubType),
+ m_geoAnycastHeaderType(valueof(p_anycastArea.geoAnycastSubType)),
p_trafficClass,
p_hopLimit
- ),
- extendedHeader := m_geoAnycastHeader(
+ )),
+ extendedHeader := valueof(m_geoAnycastHeader(
p_sourceLongPosVec,
p_seqNumber,
p_anycastArea
- ),
- payload := f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))
+ )),
+ payload := valueof(f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD")))
}
/**
@@ -939,18 +947,18 @@
in template (value) UInt8 p_hopLimit := c_defaultHopLimit,
in template (value) TrafficClass p_trafficClass := m_trafficClass
) := {
- commonHeader := m_commonHeader(
+ commonHeader := valueof(m_commonHeader(
PX_GN_UPPER_LAYER,
- m_geoBroadcastHeaderType(p_broadcastArea.geoBroadcastSubType),
+ m_geoBroadcastHeaderType(valueof(p_broadcastArea.geoBroadcastSubType)),
p_trafficClass,
p_hopLimit
- ),
- extendedHeader := m_geoBroadcastHeader(
+ )),
+ extendedHeader := valueof(m_geoBroadcastHeader(
p_sourceLongPosVec,
p_seqNumber,
p_broadcastArea
- ),
- payload := f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))
+ )),
+ payload := valueof(f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD")))
}
/**
@@ -1242,16 +1250,16 @@
template (value) GnNonSecuredPacket m_geoNwShbPacket(
in template (value) LongPosVector p_sourceLongPosVec
) := {
- commonHeader := m_commonHeader(
+ commonHeader := valueof(m_commonHeader(
PX_GN_UPPER_LAYER,
m_shbHeaderType,
m_trafficClass,
c_defaultHopLimit
- ),
- extendedHeader := m_shbHeader(
+ )),
+ extendedHeader := valueof(m_shbHeader(
p_sourceLongPosVec
- ),
- payload := f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))
+ )),
+ payload := valueof(f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD")))
}
/**
@@ -1288,17 +1296,17 @@
in template (value) UInt8 p_hopLimit := c_defaultHopLimit,
in template (value) TrafficClass p_trafficClass := m_trafficClass
) := {
- commonHeader := m_commonHeader(
+ commonHeader := valueof(m_commonHeader(
PX_GN_UPPER_LAYER,
m_tsbHeaderType,
p_trafficClass,
p_hopLimit
- ),
- extendedHeader := m_tsbHeader(
+ )),
+ extendedHeader := valueof(m_tsbHeader(
p_seqNumber,
p_sourceLongPosVec
- ),
- payload := f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD"))
+ )),
+ payload := valueof(f_adaptPayload_m(char2oct("DEFAULT_PAYLOAD")))
}
/**
@@ -1774,7 +1782,7 @@
in template (value) UInt16 p_seqNumber,
in template (value) GeoBroadcastArea p_broadcastArea
) := {
- geoBroadcastHeader := {
+ geoBroadcastHeader := valueof({
seqNumber := p_seqNumber,
reserved := c_uInt8Zero,
srcPosVector := p_sourceLongPosVec,
@@ -1784,7 +1792,7 @@
distanceB := p_broadcastArea.geoBroadcastArea.distanceB,
angle := p_broadcastArea.geoBroadcastArea.angle,
reserved2 := c_uInt24Zero
- }
+ })
}
/**
@@ -1883,7 +1891,7 @@
in template (value) UInt16 p_seqNumber,
in template (value) GeoAnycastArea p_anycastArea
) := {
- geoAnycastHeader := {
+ geoAnycastHeader := valueof({
seqNumber := p_seqNumber,
reserved := c_uInt8Zero,
srcPosVector := p_sourceLongPosVec,
@@ -1893,7 +1901,7 @@
distanceB := p_anycastArea.geoAnycastArea.distanceB,
angle := p_anycastArea.geoAnycastArea.angle,
reserved2 := c_uInt24Zero
- }
+ })
}
/**
Index: GeoNetworking/LibItsGeoNetworking_TestSystem.ttcn
===================================================================
--- GeoNetworking/LibItsGeoNetworking_TestSystem.ttcn (revision 1312)
+++ GeoNetworking/LibItsGeoNetworking_TestSystem.ttcn (working copy)
@@ -39,7 +39,10 @@
out
AcGnPrimitive, AcGn6Primitive, AcGnssPrimitive, AcSecPrimitive;
in
- AcGnResponse, AcGn6Response, AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;
+
+//FIXME RGY As discussed, boolean results are replaced by a top-level union of results
+// AcGnResponse, AcGn6Response, AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;
+ AcGnResponse, AcGn6Response, AdapterControlResults;
} // end AdapterControlPort
/**
@@ -49,7 +52,9 @@
out
UtInitialize, UtChangePosition, UtGnTrigger;
in
- UtInitializeResult, UtChangePositionResult, UtGnTriggerResult, UtGnEventInd;
+//FIXME RGY As discussed, boolean results are replaced by a top-level union of results
+// UtInitializeResult, UtChangePositionResult, UtGnTriggerResult, UtGnEventInd;
+ UtCommonResults, UtGnTriggerResult, UtGnEventInd;
} // end UpperTesterPort
} // end portDefinitions
@@ -79,13 +84,17 @@
/**
* @desc ITS Main Test Component
*/
- type component ItsMtc extends ItsBaseMtc, ServerSyncComp, ItsSecurityBaseComponent { // TODO Extend ItsBaseMtc with ItsSecurityBaseComponent? {
-
+//FIXME RGY ItsMtc can extend ItsBaseGeoNetworking instead of ItsSecurityBaseComponent, as it contains
+// everything defined here but vc_componentTable and already extends ItsSecurityBaseComponent
+// also, ItsBaseMtc already extends ServerSyncComp
+// type component ItsMtc extends ItsBaseMtc, ServerSyncComp, ItsSecurityBaseComponent { // TODO Extend ItsBaseMtc with ItsSecurityBaseComponent? {
+ type component ItsMtc extends ItsBaseMtc, ItsBaseGeoNetworking { // TODO Extend ItsBaseMtc with ItsSecurityBaseComponent? {
+/*FIXME RGY all these objects are inherited from ItsBaseGeoNetworking, they shall not be defined again: see $6.2.10.2
port UpperTesterPort utPort;
port AdapterControlPort acPort;
-
+*/
var ComponentTable vc_componentTable := {};
-
+/*
// UT indications
var UtGnEventIndList vc_utInds := {};
@@ -92,7 +101,7 @@
var boolean vc_utDefaultActive := true;
var boolean vc_acDefaultActive := true;
var boolean vc_gnDefaultActive := true;
-
+*/
} // end ItsMtc
/**
Index: GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn
===================================================================
--- GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn (revision 1312)
+++ GeoNetworking/LibItsGeoNetworking_TypesAndValues.ttcn (working copy)
@@ -1008,7 +1008,9 @@
} // end utPrimitives
with {
- encode "UpperTester"
+//FIXME RGY temporarily changed to RAW, until encoding functions are changed to UpperTester
+// encode "UpperTester"
+ encode "RAW"; variant ""
}
group acPrimitives {
Index: Ipv6OverGeoNetworking/LibItsIpv6OverGeoNetworking_Functions.ttcn
===================================================================
--- Ipv6OverGeoNetworking/LibItsIpv6OverGeoNetworking_Functions.ttcn (revision 1312)
+++ Ipv6OverGeoNetworking/LibItsIpv6OverGeoNetworking_Functions.ttcn (working copy)
@@ -38,7 +38,8 @@
* - two ITS nodes (nodeA, nodeB)
* - three GVLs
*/
- function f_cf01UpGn6() runs on ItsIpv6OverGeoNetworking system ItsIpv6OverGeoNetworkingSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cf01UpGn6() runs on ItsIpv6OverGeoNetworking {
// Variables
var float v_distance;
@@ -73,7 +74,8 @@
/**
* @desc Deletes configuration cf01Gn6
*/
- function f_cf01DownGn6() runs on ItsIpv6OverGeoNetworking system ItsIpv6OverGeoNetworkingSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cf01DownGn6() runs on ItsIpv6OverGeoNetworking {
// Map
unmap(self:ipv6OverGeoNetworkingPort, system:ipv6OverGeoNetworkingPort);
@@ -296,12 +298,14 @@
var LongPosVector v_nodeLongPosVector := f_getPosition(p_compName);
f_sendGeoNetMessageWithPayload(
- m_geoNwReq_linkLayerBroadcast(
- m_geoNwPdu(
- m_geoNwBroadcastPacket(
- v_nodeLongPosVector,
- vc_localSeqNumber,
- f_getGeoBroadcastArea(valueof(p_gvl.area))
+ valueof(
+ m_geoNwReq_linkLayerBroadcast(
+ m_geoNwPdu(
+ m_geoNwBroadcastPacket(
+ v_nodeLongPosVector,
+ vc_localSeqNumber,
+ f_getGeoBroadcastArea(valueof(p_gvl.area))
+ )
)
)
),
@@ -312,12 +316,12 @@
c_icmpHdr,
m_rtAdvWithOptions(
m_rtAdvOpt_prefixOpt(
- p_gvl.prefixLength,
+ valueof(p_gvl.prefixLength),
c_lFlag1,
c_aFlag1,
p_validLifetime,
c_preferredLifetime30s,
- p_gvl.prefix
+ valueof(p_gvl.prefix)
)
)
)
Index: Ipv6OverGeoNetworking/LibItsIpv6OverGeoNetworking_TypesAndValues.ttcn
===================================================================
--- Ipv6OverGeoNetworking/LibItsIpv6OverGeoNetworking_TypesAndValues.ttcn (revision 1312)
+++ Ipv6OverGeoNetworking/LibItsIpv6OverGeoNetworking_TypesAndValues.ttcn (working copy)
@@ -171,7 +171,7 @@
//geographic
const Bit7 c_itsGn6aslGeoAnycastID := '1111101'B; //TODO TDB by IANA
- }//end group ipv6Address
+ } //end group ipv6Address
/**
* @desc PDU type derived from RFC2461 clause 4.2
@@ -189,7 +189,7 @@
UInt32 reachableTime,
UInt32 retransTimer,
RtAdvOptions rtAdvOptions optional
- } with { variant (checksum) "MarkForIPv6ChecksumCalculation" }
+ } // FIXME CHECK while TITAN refuse it: with { variant (checksum) "MarkForIPv6ChecksumCalculation" }
/**
* @desc RouterAdvertisement option list
Index: IVIM/LibItsIvim_Functions.ttcn
===================================================================
--- IVIM/LibItsIvim_Functions.ttcn (revision 1312)
+++ IVIM/LibItsIvim_Functions.ttcn (working copy)
@@ -159,7 +159,9 @@
utPort.send(p_event);
tc_wait.start;
alt {
- [] utPort.receive(UtIvimTerminationResult:?) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type
+// [] utPort.receive(UtIvimTerminationResult:?) {
+ [] utPort.receive(UtIvimResults:{utIvimTerminationResult:=?}) {
tc_wait.stop;
}
[] tc_wait.timeout {
@@ -243,7 +245,8 @@
*/
function f_cfUp(
in charstring p_certificateId := PX_CERT_FOR_TS
- ) runs on ItsIvim system ItsIvimSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ ) runs on ItsIvim /*system ItsIvimSystem*/ {
map(self:acPort, system:acPort);
map(self:utPort, system:utPort);
@@ -258,7 +261,8 @@
/**
* @desc Deletes default configuration
*/
- function f_cfDown() runs on ItsIvim system ItsIvimSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cfDown() runs on ItsIvim /*system ItsIvimSystem*/ {
// Initialise secured mode
f_uninitialiseSecuredMode();
@@ -373,7 +377,7 @@
var FncRetCode v_ret := e_success;
if (valueof(p_trigger) == e_ets) {
- f_sendIviMessage(m_ivimStructureCancellation(p_iviIdentificationNumber));
+ f_sendIviMessage(valueof(m_ivimStructureCancellation(p_iviIdentificationNumber)));
f_sleep(PX_TNOAC);
}
else {
Index: IVIM/LibItsIvim_Templates.ttcn
===================================================================
--- IVIM/LibItsIvim_Templates.ttcn (revision 1312)
+++ IVIM/LibItsIvim_Templates.ttcn (working copy)
@@ -26,11 +26,13 @@
import from LibItsCommon_TypesAndValues all;
import from LibItsCommon_Functions all;
import from LibItsCommon_Pixits all;
+ import from LibItsCommon_ASN1_NamedNumbers all;
// LibItsIvim
import from LibItsIvim_TestSystem all;
import from LibItsIvim_TypesAndValues all;
import from LibItsIvim_Functions all;
+ import from LibItsIvim_ASN1_IVInamedNumbers all;
group asn1Constants {
} // End of group asn1Constants
@@ -75,7 +77,9 @@
* @param p_gnLifetime GN packet lifetime value (ms)
* @param p_gnTrafficClass GN traffic class value
*/
- template IvimInd mw_ivimIndWithGnParameters (
+//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
+// template IvimInd mw_ivimIndWithGnParameters (
+ template(present) IvimInd mw_ivimIndWithGnParameters (
template (present) IVIM p_iviMsg,
in template UInt8 p_gnNextHeader := *,
in template UInt8 p_gnHeaderType := *,
@@ -96,7 +100,9 @@
* @param p_btpDestinationPort BTP destination port value
* @param p_btpInfo BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
*/
- template IvimInd mw_ivimIndWithBtpParameters (
+//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
+// template IvimInd mw_ivimIndWithBtpParameters (
+ template(present) IvimInd mw_ivimIndWithBtpParameters (
template (present) IVIM p_iviMsg,
template UInt16 p_btpDestinationPort := *,
template UInt16 p_btpInfo := *
@@ -111,7 +117,8 @@
* @param p_ssp SSP security parameter
* @param p_its_aid ITS-AID value
*/
- template IvimInd mw_ivimIndWithSecurityParameters (
+//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
+ template(present) IvimInd mw_ivimIndWithSecurityParameters (
template (present) IVIM p_iviMsg,
template Bit256 p_ssp := *,
template UInt32 p_its_aid := *
@@ -308,7 +315,7 @@
template (value) IviStructure m_ivimStructureCancellation(
in template (value) IviIdentificationNumber p_iviIdentificationNumber
) := {
- mandatory := m_iviManagementContainer(f_getProvider(), p_iviIdentificationNumber, IviStatus_cancellation_),
+ mandatory := valueof(m_iviManagementContainer(f_getProvider(), valueof(p_iviIdentificationNumber), IviStatus_cancellation_)),
optional_ := omit
} // End of template m_ivimStructureCancellation
Index: IVIM/LibItsIvim_TestSystem.ttcn
===================================================================
--- IVIM/LibItsIvim_TestSystem.ttcn (revision 1312)
+++ IVIM/LibItsIvim_TestSystem.ttcn (working copy)
@@ -37,7 +37,10 @@
out
AcGnssPrimitive, AcSecPrimitive;
in
- AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;
+//FIXME RGY as discussed, list of boolean responses is replaced by a union
+// AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;
+ AdapterControlResults;
+
} // end AdapterControlPort
/**
@@ -47,8 +50,11 @@
out
UtInitialize, UtIvimTrigger, UtIvimUpdate, UtIvimTermination, UtChangePosition, UtChangePseudonym;
in
- UtInitializeResult, UtIvimTriggerResult, UtIvimUpdateResult, UtIvimTerminationResult,
- UtChangePositionResult, UtChangePseudonymResult, UtIvimEventInd;
+//FIXME RGY as discussed, list of boolean responses is replaced by a union
+// UtInitializeResult, UtIvimTriggerResult, UtIvimUpdateResult, UtIvimTerminationResult,
+// UtChangePositionResult, UtChangePseudonymResult, UtIvimEventInd;
+ UtInitializeResult, UtIvimTriggerResult, UtIvimUpdateResult, UtIvimEventInd, UtIvimResults, UtCommonResults;
+
} // end UpperTesterPort
} // end portDefinitions
Index: IVIM/LibItsIvim_TypesAndValues.ttcn
===================================================================
--- IVIM/LibItsIvim_TypesAndValues.ttcn (revision 1312)
+++ IVIM/LibItsIvim_TypesAndValues.ttcn (working copy)
@@ -102,7 +102,12 @@
/**
* @desc Upper Tester result message of termination of an event on Ivim IUT
*/
- type boolean UtIvimTerminationResult;
+//FIXME RGY as discussed, simple boolean responses are replaced by a union of results;
+ type union UtIvimResults {
+ boolean utIvimTerminationResult
+ }
+// type boolean UtIvimTerminationResult;
+ type UtIvimResults.utIvimTerminationResult UtIvimTerminationResult;
/**
* @desc Upper Tester message to check event/status on Ivim IUT
Index: MapemSpatem/LibItsMapemSpatem_Functions.ttcn
===================================================================
--- MapemSpatem/LibItsMapemSpatem_Functions.ttcn (revision 1312)
+++ MapemSpatem/LibItsMapemSpatem_Functions.ttcn (working copy)
@@ -18,7 +18,7 @@
// LibIts
import from ITS_Container language "ASN.1:1997" all;
- import from DSRC language "ASN.1:1997" all;
+ import from IS_DSRC language "ASN.1:1997" all;
// LibItsCommon
import from LibItsCommon_TypesAndValues all;
@@ -44,7 +44,9 @@
utPort.send(p_init);
tc_wait.start;
alt {
- [] utPort.receive(UtInitializeResult:true) {
+//FIXME RGY the simple boolean result has been changed to a union
+// [] utPort.receive(UtInitializeResult:true) {
+ [] utPort.receive(UtCommonResults:{utInitializeResult:=true}) {
tc_wait.stop;
log("*** " & testcasename() & ": INFO: IUT initialized ***");
}
@@ -70,8 +72,14 @@
utPort.send ( p_event );
tc_wait.start;
+//FIXME RGY temporal variable to save the result-union value
+var UtMapemSpatemResuls v_UtMapemSpatemResuls;
alt {
- [] utPort.receive ( UtMapemSpatemTriggerResult:? ) -> value v_result {
+//FIXME RGY the simple boolean result has been changed to a union
+// [] utPort.receive ( UtMapemSpatemTriggerResult:? ) -> value v_result {
+ [] utPort.receive (UtMapemSpatemResuls:{utMapemSpatemTriggerResult:=?} ) -> value v_UtMapemSpatemResuls {
+//FIXME RGY storing result from the temporal variable
+ v_result:= v_UtMapemSpatemResuls.utMapemSpatemTriggerResult;
tc_wait.stop;
if ( not v_result ) {
f_selfOrClientSyncAndVerdict("MapSpat Trigger failed", e_error);
@@ -223,9 +231,10 @@
* @desc Setups default configuration
* @param p_certificateId The certificate identifier the TA shall use in case of secured IUT
*/
+//FIXME RGY Titan doesn't support mtc and system clauses yet
function f_cfUp(
in charstring p_certificateId := PX_CERT_FOR_TS
- ) runs on ItsMapemSpatem system ItsMapemSpatemSystem {
+ ) runs on ItsMapemSpatem /*system ItsMapemSpatemSystem*/ {
map(self:acPort, system:acPort);
map(self:utPort, system:utPort);
@@ -243,7 +252,8 @@
/**
* @desc Deletes default configuration
*/
- function f_cfDown() runs on ItsMapemSpatem system ItsMapemSpatemSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cfDown() runs on ItsMapemSpatem {
// Initialise secured mode
f_uninitialiseSecuredMode();
@@ -332,6 +342,6 @@
}
}
- } // End of receiveFunctions
+ } // End of group receiveFunctions
-} // End of module LibItsMapemSpatem_Functions
\ No newline at end of file
+} // End of module LibItsMapemSpatem_Functions
Index: MapemSpatem/LibItsMapemSpatem_Pixits.ttcn
===================================================================
--- MapemSpatem/LibItsMapemSpatem_Pixits.ttcn (revision 1312)
+++ MapemSpatem/LibItsMapemSpatem_Pixits.ttcn (working copy)
@@ -16,7 +16,8 @@
import from LibCommon_BasicTypesAndValues all;
// LibIts
- import from DSRC language "ASN.1:1997" all;
+ import from IS_DSRC language "ASN.1:1997" all;
+ import from IS_DSRC_REGION_noCircular language "ASN.1:1997" all;
// LibItsMapemSpatem
import from LibItsMapemSpatem_TypesAndValues all;
@@ -34,7 +35,7 @@
/**
* @desc Status for IntersectionState DF sending
*/
- modulepar IntersectionStatusObject PX_STATUS := IntersectionStatusObject_manualControlIsEnabled_;
+ modulepar IntersectionStatusObject PX_STATUS := '1000000000000000'B;
/**
* @desc Id for IntersectionReferenceID DF sending
Index: MapemSpatem/LibItsMapemSpatem_Templates.ttcn
===================================================================
--- MapemSpatem/LibItsMapemSpatem_Templates.ttcn (revision 1312)
+++ MapemSpatem/LibItsMapemSpatem_Templates.ttcn (working copy)
@@ -19,11 +19,14 @@
import from ITS_Container language "ASN.1:1997" all;
import from MAPEM_PDU_Descriptions language "ASN.1:1997" all;
import from SPATEM_PDU_Descriptions language "ASN.1:1997" all;
- import from DSRC language "ASN.1:1997" all;
+ import from IS_DSRC language "ASN.1:1997" all;
+ import from IS_DSRC_REGION_noCircular language "ASN.1:1997" all;
// LibItsCommon
import from LibItsCommon_Functions all;
import from LibItsCommon_TypesAndValues all;
+ import from LibItsCommon_ASN1_NamedNumbers all;
+ import from LibItsCommon_ASN1_ISDSRC_NamedNumbers all;
// LibItsMapemSpatem
import from LibItsMapemSpatem_TestSystem all;
@@ -91,7 +94,9 @@
* @param p_btpDestinationPort BTP destination port value
* @param p_btpInfo BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
*/
- template MapemInd mw_mapemIndWithBtpParameters(
+//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
+// template MapemInd mw_mapemIndWithBtpParameters(
+ template(present) MapemInd mw_mapemIndWithBtpParameters(
template (present) MAPEM p_mapemMsg,
in template UInt16 p_btpDestinationPort := *,
in template UInt16 p_btpInfo := *
@@ -174,7 +179,9 @@
* @param p_btpDestinationPort BTP destination port value
* @param p_btpInfo BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
*/
- template SpatemInd mw_spatemIndWithBtpParameters(
+//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
+// template SpatemInd mw_spatemIndWithBtpParameters(
+ template(present) SpatemInd mw_spatemIndWithBtpParameters(
template (present) SPATEM p_spatemMsg,
template UInt16 p_btpDestinationPort := *,
template UInt16 p_btpInfo := *
@@ -385,7 +392,9 @@
/**
* @desc Receive template for MAPEM Message
*/
- template (omit) MapData m_mapem(
+//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
+// template (omit) MapData m_mapem(
+ template (value) MapData m_mapem(
in template (value) MsgCount p_msgIssueRevision,
in template (omit) IntersectionGeometryList p_intersectionGeometryList := omit,
in template (omit) RoadSegmentList p_roadSegments := omit
@@ -560,7 +569,9 @@
/**
* @desc Send template for SPAT Message
*/
- template (omit) SPAT m_spatem(
+//FIXME RGY template should be (present), no omit is assigned to it as a whole; Titan currently requires that the modified templte has at least the same restirction as the base
+// template (omit) SPAT m_spatem(
+ template (value) SPAT m_spatem(
in template (value) IntersectionStateList p_intersections,
in template (omit) DescriptiveName p_name := omit
) modifies m_defaultSpatem:= {
@@ -588,7 +599,7 @@
template (value) MovementList m_movements := { m_movement };
- template (value) MovementState m_movement := {
+ template (omit) MovementState m_movement := {
movementName := omit,
signalGroup := PX_SIGNAL_GROUP_ID,
state_time_speed := m_movementEventList,
Index: MapemSpatem/LibItsMapemSpatem_TestSystem.ttcn
===================================================================
--- MapemSpatem/LibItsMapemSpatem_TestSystem.ttcn (revision 1312)
+++ MapemSpatem/LibItsMapemSpatem_TestSystem.ttcn (working copy)
@@ -39,7 +39,9 @@
out
AcSecPrimitive;
in
- AcSecResponse;
+//FIXME RGY As discussed, boolean response types are replaced by union of boolean responses
+// AcSecResponse;
+ AdapterControlResults
} // end AdapterControlPort
/**
@@ -49,7 +51,9 @@
out
UtInitialize, UtMapemSpatemTrigger;
in
- UtInitializeResult, UtMapemSpatemTriggerResult, UtMapemEventInd , UtSpatemEventInd;
+//FIXME RGY as discussed, boolean results are replaced by union of booleans
+// UtInitializeResult, UtMapemSpatemTriggerResult, UtMapemEventInd , UtSpatemEventInd;
+ UtCommonResults, UtMapemSpatemResuls, UtMapemEventInd , UtSpatemEventInd;
} // end UpperTesterPort
} // end portDefinitions
Index: MapemSpatem/LibItsMapemSpatem_TypesAndValues.ttcn
===================================================================
--- MapemSpatem/LibItsMapemSpatem_TypesAndValues.ttcn (revision 1312)
+++ MapemSpatem/LibItsMapemSpatem_TypesAndValues.ttcn (working copy)
@@ -48,7 +48,12 @@
/**
* @desc Upper Tester result message of request of triggering of an event at IUT
*/
- type boolean UtMapemSpatemTriggerResult;
+//FIXME RGY as discussed boolean results are replaced by union of booleans
+ type union UtMapemSpatemResuls {
+ boolean utMapemSpatemTriggerResult
+ }
+// type boolean UtMapemSpatemTriggerResult;
+ type UtMapemSpatemResuls.utMapemSpatemTriggerResult UtMapemSpatemTriggerResult;
/**
* @desc Upper Tester message to check event/status at IUT
Index: Security/LibItsSecurity_Functions.ttcn3
===================================================================
--- Security/LibItsSecurity_Functions.ttcn3 (revision 1312)
+++ Security/LibItsSecurity_Functions.ttcn3 (working copy)
@@ -24,6 +24,7 @@
import from LibItsSecurity_Templates all;
import from LibItsSecurity_Pixits all;
import from LibItsSecurity_TestSystem all;
+ import from LibItsSecurity_EncdecDeclarations all;
group helpersFunctions {
@@ -262,7 +263,7 @@
return false;
}
} else {
- if(not f_readSigningKey(valueof(cc_taCert_A), v_privateKey)){
+ if(not f_readSigningKey(cc_taCert_A, v_privateKey)){
return false;
}
}
@@ -272,7 +273,7 @@
);
p_securedMessage := m_securedMessage(
- v_toBeSignedSecuredMessage.header_fields,
+ valueof(v_toBeSignedSecuredMessage.header_fields),
p_payloadField,
{
m_trailer_field_signature(
@@ -417,7 +418,7 @@
// log("p_trailerStatus=", p_trailerStatus);
if (p_trailerStatus == 0) { // No signature
p_securedMessage := m_securedMessage(
- v_toBeSignedSecuredMessage.header_fields,
+ valueof(v_toBeSignedSecuredMessage.header_fields),
p_payloadField,
{ }
);
@@ -424,7 +425,7 @@
v_trailerSize := 0;
} else if (p_trailerStatus == 2) { // Duplicate signature
p_securedMessage := m_securedMessage(
- v_toBeSignedSecuredMessage.header_fields,
+ valueof(v_toBeSignedSecuredMessage.header_fields),
p_payloadField,
{
m_trailer_field_signature(
@@ -452,7 +453,7 @@
} else if (p_trailerStatus == 3) { // Signature with reserved algorthm
p_securedMessage := m_securedMessage_wrong_protocol(
p_protocolVersion,
- v_toBeSignedSecuredMessage.header_fields,
+ valueof(v_toBeSignedSecuredMessage.header_fields),
p_payloadField,
{
m_trailer_field_signature(
@@ -464,7 +465,7 @@
);
} else { // Invalid signature
p_securedMessage := m_securedMessage(
- v_toBeSignedSecuredMessage.header_fields,
+ valueof(v_toBeSignedSecuredMessage.header_fields),
p_payloadField,
{
m_trailer_field_signature(
@@ -1020,7 +1021,7 @@
if (valueof(p_issuingCertificate.subject_attributes[v_counter].type_) == e_verification_key) {
return f_verifyCertificateSignatureWithPublicKey(
p_certificateToBeVerified,
- p_issuingCertificate.subject_attributes[v_counter].attribute.key);
+ valueof(p_issuingCertificate.subject_attributes[v_counter].attribute.key));
}
} // End of 'for' statement
@@ -1053,8 +1054,8 @@
// Create SecuredMessage payload to be signed
v_toBeSignedSecuredMessage := m_toBeSignedSecuredMessage(
- p_securedMessage.header_fields,
- p_securedMessage.payload_field,
+ valueof(p_securedMessage.header_fields),
+ valueof(p_securedMessage.payload_field),
e_signature
);
log("f_verifyGnSecuredMessageSignatureWithPublicKey: v_toBeSignedSecuredMessage=", v_toBeSignedSecuredMessage);
@@ -1107,7 +1108,7 @@
if (v_subjectAttribute.type_ == e_verification_key) {
return f_verifyGnSecuredMessageSignatureWithPublicKey(
p_securedMessage,
- p_certificate.subject_attributes[v_counter].attribute.key);
+ valueof(p_certificate.subject_attributes[v_counter].attribute.key));
}
} // End of 'for' statement
@@ -1315,8 +1316,11 @@
) return boolean {
for (var integer i := 0; i < lengthof(p_cert.validity_restrictions); i := i + 1) {
- if (valueof(p_cert).validity_restrictions[i].type_ == p_type) {
- p_return := valueof(p_cert).validity_restrictions[i];
+//FIXME RGY Titan doesn't support dot notation after valueof at the moment
+// if (valueof(p_cert).validity_restrictions[i].type_ == p_type) {
+// p_return := valueof(p_cert).validity_restrictions[i];
+ if (valueof(p_cert.validity_restrictions[i].type_) == p_type) {
+ p_return := valueof(p_cert.validity_restrictions[i]);
return true;
}
} // End of 'for' statement
@@ -1344,8 +1348,11 @@
out SubjectAttribute p_return
) return boolean {
for (var integer i := 0; i < lengthof(p_cert.subject_attributes); i := i + 1) {
- if (valueof(p_cert).subject_attributes[i].type_ == p_type) {
- p_return := valueof(p_cert).subject_attributes[i];
+//FIXME RGY Titan doesn't support dot notation after valueof at the moment
+// if (valueof(p_cert).subject_attributes[i].type_ == p_type) {
+// p_return := valueof(p_cert).subject_attributes[i];
+ if (valueof(p_cert.subject_attributes[i].type_) == p_type) {
+ p_return := valueof(p_cert.subject_attributes[i]);
return true;
}
}
@@ -1746,8 +1753,11 @@
in template (value) TwoDLocation p_location
) return boolean {
return
- (valueof(p_location).longitude != c_maxLongitude + 1) and
- (valueof(p_location).latitude != c_maxLatitude + 1);
+//FIXME RGY Titan doesn't support dot notation after valueof at the moment
+// (valueof(p_location).longitude != c_maxLongitude + 1) and
+// (valueof(p_location).latitude != c_maxLatitude + 1);
+ (valueof(p_location.longitude) != c_maxLongitude + 1) and
+ (valueof(p_location.latitude) != c_maxLatitude + 1);
} // End of function f_isValidTwoDLocation
/**
@@ -1763,10 +1773,15 @@
in template (value) RectangularRegion p_r2
) return boolean {
return not (
- valueof(p_r2).northwest.longitude > valueof(p_r1).southeast.longitude or
- valueof(p_r2).southeast.longitude < valueof(p_r1).northwest.longitude or
- valueof(p_r2).southeast.latitude > valueof(p_r1).northwest.latitude or
- valueof(p_r2).northwest.latitude < valueof(p_r1).southeast.latitude
+//FIXME RGY Titan doesn't support dot notation after valueof at the moment
+// valueof(p_r2).northwest.longitude > valueof(p_r1).southeast.longitude or
+// valueof(p_r2).southeast.longitude < valueof(p_r1).northwest.longitude or
+// valueof(p_r2).southeast.latitude > valueof(p_r1).northwest.latitude or
+// valueof(p_r2).northwest.latitude < valueof(p_r1).southeast.latitude
+ valueof(p_r2.northwest.longitude) > valueof(p_r1.southeast.longitude) or
+ valueof(p_r2.southeast.longitude) < valueof(p_r1.northwest.longitude) or
+ valueof(p_r2.southeast.latitude) > valueof(p_r1.northwest.latitude) or
+ valueof(p_r2.northwest.latitude) < valueof(p_r1.southeast.latitude)
);
} // End of function f_isRectangularRegionsIntersected
@@ -1778,12 +1793,12 @@
for (v_i := 0; v_i < lengthof(p_region); v_i := v_i + 1) {
var PolygonalRegion v_region_base;
- f_convertRectangularRegionIntoPolygonalRegion(p_region[v_i], v_region_base);
+ f_convertRectangularRegionIntoPolygonalRegion(valueof(p_region[v_i]), v_region_base);
v_found := false;
for (v_j := 0; v_j < lengthof(p_region); v_j := v_j + 1) {
if (v_j != v_i) {
var PolygonalRegion v_region;
- f_convertRectangularRegionIntoPolygonalRegion(p_region[v_j], v_region);
+ f_convertRectangularRegionIntoPolygonalRegion(valueof(p_region[v_j]), v_region);
if (f_isPolygonalRegionInside(v_region, v_region_base) == true) {
v_found := true;
}
@@ -1812,9 +1827,9 @@
for (v_i := 0; v_i < lengthof(p_parent); v_i := v_i + 1) {
var PolygonalRegion v_region_parent, v_region;
- f_convertRectangularRegionIntoPolygonalRegion(p_parent[v_i], v_region_parent);
+ f_convertRectangularRegionIntoPolygonalRegion(valueof(p_parent[v_i]), v_region_parent);
for (v_j := 0; v_j < lengthof(p_parent); v_j := v_j + 1) {
- f_convertRectangularRegionIntoPolygonalRegion(p_region[v_j], v_region);
+ f_convertRectangularRegionIntoPolygonalRegion(valueof(p_region[v_j]), v_region);
if (f_isPolygonalRegionInside(v_region, v_region_parent) == true) {
return true;
}
@@ -1911,24 +1926,26 @@
) return boolean {
var boolean v_ret := false;
- select (p_region.region_type) {
+//FIXME RGY valeuof is missing: argument of select case is Expression (see $19.3.1)
+// select (p_region.region_type) {
+ select (valueof(p_region.region_type)) {
case (e_none) {
v_ret := true;
}
case (e_circle) {
- v_ret := f_isLocationInsideCircularRegion(p_region.region.circular_region, p_location);
+ v_ret := f_isLocationInsideCircularRegion(valueof(p_region.region.circular_region), p_location);
}
case (e_rectangle) {
- v_ret := f_isLocationInsideRectangularRegion(p_region.region.rectangular_region, p_location);
+ v_ret := f_isLocationInsideRectangularRegion(valueof(p_region.region.rectangular_region), p_location);