Skip to content

Commit 22815aa

Browse files
committed
New implementation of ada2wsdl based on LaL.
This new implementation is based on LaL and do not use ASIS anymore. The -I options has been removed as not supported anymore. The LaL parser is project based exclusively. Some expected output have been updated as the new implementation does better work with the name-space by avoiding generating some NS that are not used. So the NS prefix may be different. We disable the check on routines ordering in ada2wsdl-parser.adb as some generics make it impossible to follow this rule. Note that this new implementation does far better job as computing the range (range <low> .. <high>) and array indexes. The new parser walk up the tree and do proper computation of the values instead of relying on some simple format checked by regexp. So for example a range like: range 1 + 6 - 4 .. integer'last - 7 Will be properly computed avoiding some restriction on the specs. For S415-009.
1 parent c6e0830 commit 22815aa

File tree

49 files changed

+1620
-2150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1620
-2150
lines changed

docs/source/using_wsdl.rst

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ Creating WSDL documents
4141

4242
.. index:: ada2wsdl
4343

44-
Note that this tool is based on `ASIS`.
44+
Note that this tool is based on `LibAdaLang`.
4545

4646
.. _Using_ada2wsdl:
4747

4848
Using ada2wsdl
4949
--------------
5050

5151
`ada2wsdl` can be used on any Ada spec file to generated a
52-
`WSDL` document. The Ada spec is parsed using `ASIS`.
52+
`WSDL` document. The Ada spec is parsed using `LibAdaLang`.
5353

5454
.. highlight:: sh
5555

@@ -494,10 +494,6 @@ ada2wsdl
494494
*-lit*
495495
Generate literal's style binding (default is encoded)
496496

497-
*-I path*
498-
Add path option for the `ASIS` compilation step. This option can
499-
appear any number of time on the command line.
500-
501497
*-n name*
502498
Specify the schema name space root name. The default value is "soapaws".
503499

makefile.conf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ endif
6262

6363
##############################################################################
6464
# LAL optional, needed if you want to build ada2wsdl tool. This tool can be
65-
# used to create a WSDL document from an Ada spec. Set ASIS to true to
66-
# activate ASIS support. You must also set ADA_PROJECT_PATH to point to the
67-
# ASIS project files if not installed in the standard location.
65+
# used to create a WSDL document from an Ada spec. Set LAL to true to
66+
# activate LAL support. You must also set ADA_PROJECT_PATH to point to the
67+
# LAL project files if not installed in the standard location.
6868
#
69-
# If you activate ASIS you also need to activate XMLADA above.
69+
# If you activate LAL you also need to activate XMLADA above.
7070
#
7171
# LAL = [true|false]
7272
#

regtests/0103_soapcheck/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from test_support import *
22

33
exec_cmd('ada2wsdl',
4-
['-q', '-f', '-I.', '-Psoapcheck', 'pck.ads', '-o', 'pck.wsdl'])
4+
['-q', '-f', '-Psoapcheck', 'pck.ads', '-o', 'pck.wsdl'])
55
exec_cmd('wsdl2aws',
66
['-q', '-f', '-cb', '-spec', 'pck', 'pck.wsdl'])
77

regtests/0162_wsdl_1_main/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from test_support import *
22

33
exec_cmd('ada2wsdl',
4-
['-q', '-f', '-I.', '-Pwsdl_1_main',
4+
['-q', '-f', '-Pwsdl_1_main',
55
'-a', 'http://localhost:7701', 'wsdl_1.ads', '-o', 'wsdl_1.wsdl'])
66
exec_cmd('wsdl2aws',
77
['-q', '-f', '-cb', '-types', 'wsdl_1', 'wsdl_1.wsdl'])

regtests/0163_wsdl_2_main/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from test_support import *
22

33
exec_cmd('ada2wsdl',
4-
['-q', '-f', '-I.', '-Pwsdl_2_main',
4+
['-q', '-f', '-Pwsdl_2_main',
55
'-a', 'http://localhost:7702', 'wsdl_2.ads', '-o', 'wsdl_2.wsdl'])
66
exec_cmd('wsdl2aws',
77
['-q', '-f', '-cb', '-types', 'wsdl_2', 'wsdl_2.wsdl'])

regtests/0164_wsdl_3_main/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from test_support import *
22

33
exec_cmd('ada2wsdl',
4-
['-q', '-f', '-I.', '-Pwsdl_3_main',
4+
['-q', '-f', '-Pwsdl_3_main',
55
'-a', 'http://localhost:7703', 'wsdl_3.ads', '-o', 'wsdl_3.wsdl'])
66
exec_cmd('wsdl2aws',
77
['-q', '-f', '-cb', '-types', 'wsdl_3', 'wsdl_3.wsdl'])

regtests/0165_wsdl_4_main/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from test_support import *
22

33
exec_cmd('ada2wsdl',
4-
['-q', '-f', '-I.', '-Pwsdl_4_main',
4+
['-q', '-f', '-Pwsdl_4_main',
55
'-a', 'http://localhost:7704', 'wsdl_4.ads', '-o', 'wsdl_4.wsdl'])
66
exec_cmd('wsdl2aws',
77
['-q', '-f', '-cb', '-types', 'wsdl_4', 'wsdl_4.wsdl'])

regtests/0166_wsdl_5_main/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from test_support import *
22

33
exec_cmd('ada2wsdl',
4-
['-q', '-f', '-I.', '-Pwsdl_5_main',
4+
['-q', '-f', '-Pwsdl_5_main',
55
'-a', 'http://localhost:7705', 'wsdl_5.ads', '-o', 'wsdl_5.wsdl'])
66
exec_cmd('wsdl2aws',
77
['-q', '-f', '-cb', '-types', 'wsdl_5', 'wsdl_5.wsdl'])

regtests/0167_wsdl_6_main/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from test_support import *
22

33
exec_cmd('ada2wsdl',
4-
['-q', '-f', '-I.', '-Pwsdl_6_main',
4+
['-q', '-f', '-Pwsdl_6_main',
55
'-a', 'http://localhost:7706', 'wsdl_6.ads', '-o', 'wsdl_6.wsdl'])
66
exec_cmd('wsdl2aws',
77
['-q', '-f', '-cb', '-types', 'wsdl_6', 'wsdl_6.wsdl'])

regtests/0168_wsdl_7_main/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from test_support import *
22

33
exec_cmd('ada2wsdl',
4-
['-q', '-f', '-I.', '-Pwsdl_7_main',
4+
['-q', '-f', '-Pwsdl_7_main',
55
'-a', 'http://localhost:7707', 'wsdl_7.ads', '-o', 'wsdl_7.wsdl'])
66
exec_cmd('wsdl2aws',
77
['-q', '-f', '-cb', '-types', 'wsdl_7', 'wsdl_7.wsdl'])

0 commit comments

Comments
 (0)