Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
kazoo
Commits
89bf5a8b
Commit
89bf5a8b
authored
Jan 24, 2018
by
Maxime Perrotin
Browse files
Create output directory structure
parent
d47249dc
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/taste-backend-skeletons.adb
View file @
89bf5a8b
...
...
@@ -98,9 +98,17 @@ package body TASTE.Backend.Skeletons is
Process_Interfaces
(
Func_Tmpl
.
Required
,
Path
,
Code
))
else
Null_Set
);
Body_Text
:
constant
String
:=
(
if
Proceed
then
Parse
(
Path
&
"body.tmplt"
,
Func_Body
)
else
""
);
(
if
Proceed
then
Parse
(
Path
&
"body.tmplt"
,
Func_Body
)
else
""
);
Output_Src
:
constant
String
:=
Model
.
Configuration
.
Output_Dir
.
all
&
"/"
&
To_String
(
Each
.
Name
)
&
"/"
&
Language
&
"/"
&
"src"
;
begin
if
Proceed
then
Create_Path
(
Output_Src
);
Put
(
"*** Generating "
);
Put_Line
(
Parse
(
Path
&
"header-filename.tmplt"
,
Hdr_Tmpl
));
Put_Line
(
Header_Text
);
...
...
src/taste-parser_utils.adb
View file @
89bf5a8b
...
...
@@ -11,8 +11,7 @@ with Ada.Text_IO,
Ocarina
.
Configuration
,
Ocarina
.
FE_AADL
.
Parser
,
Ocarina
.
Instances
.
Queries
,
TASTE
.
Parser_Version
,
TASTE
.
Templates
;
TASTE
.
Parser_Version
;
package
body
TASTE
.
Parser_Utils
is
...
...
@@ -22,8 +21,7 @@ package body TASTE.Parser_Utils is
Templates_Parser
,
Templates_Parser
.
Utils
,
Ocarina
.
Instances
.
Queries
,
Ocarina
.
ME_AADL
,
TASTE
.
Templates
;
Ocarina
.
ME_AADL
;
procedure
Banner
is
The_Banner
:
constant
String
:=
...
...
@@ -91,44 +89,32 @@ package body TASTE.Parser_Utils is
if
Result
.
Version
then
raise
Exit_From_Command_Line
;
end
if
;
if
Result
.
Output_Dir
.
all
'
Length
=
0
then
Result
.
Output_Dir
:=
new
String
'(
"."
);
end
if
;
end
Parse_Command_Line
;
procedure
Debug_Dump
(
Config
:
Taste_Configuration
)
is
Vec
:
Tag
;
Vec
:
Tag
;
Template
:
Translate_Set
;
begin
Put_Line
(
"Command line (raw dump):"
);
Put_Line
(
" |_ Interface View : "
&
Config
.
Interface_View
.
all
);
Put_Line
(
" |_ Deployment View : "
&
Config
.
Deployment_View
.
all
);
Put_Line
(
" |_ Data View : "
&
Config
.
Data_View
.
all
);
Put_Line
(
" |_ Output Dir : "
&
Config
.
Output_Dir
.
all
);
Put_Line
(
" |_ Use POHIC : "
&
Config
.
Use_POHIC
'
Img
);
Put_Line
(
" |_ Glue : "
&
Config
.
Use_POHIC
'
Img
);
Put_Line
(
" |_ Skeletons : "
&
Config
.
Skeletons
'
Img
);
Put_Line
(
" |_ Timer Res : "
&
Config
.
Timer_Resolution
'
Img
);
Put_Line
(
" |_ Version : "
&
Config
.
Version
'
Img
);
Put_Line
(
" |_ Debug : "
&
Config
.
Debug_Flag
'
Img
);
for
Each
of
Config
.
Other_Files
loop
Put_Line
(
" |_ Other file : "
&
Each
);
end
loop
;
Put_Line
(
"Dump generated from a template file:"
);
New_Set
;
Tmpl_Map
(
"Interface_View"
,
Config
.
Interface_View
.
all
);
Tmpl_Map
(
"Deployment_View"
,
Config
.
Deployment_View
.
all
);
Tmpl_Map
(
"Data_View"
,
Config
.
Data_View
.
all
);
Tmpl_Map
(
"Output_Dir"
,
Config
.
Output_Dir
.
all
);
Template
:=
+
Assoc
(
"Interface_View"
,
Config
.
Interface_View
.
all
)
&
Assoc
(
"Deployment_View"
,
Config
.
Deployment_View
.
all
)
&
Assoc
(
"Data_View"
,
Config
.
Data_View
.
all
)
&
Assoc
(
"Output_Dir"
,
Config
.
Output_Dir
.
all
)
&
Assoc
(
"Skeletons"
,
Config
.
Skeletons
)
&
Assoc
(
"Glue"
,
Config
.
Glue
)
&
Assoc
(
"Use_POHIC"
,
Config
.
Use_POHIC
)
&
Assoc
(
"Debug_Flag"
,
Config
.
Debug_Flag
)
&
Assoc
(
"Version"
,
Config
.
Version
)
&
Assoc
(
"Timer_Resolution"
,
Config
.
Timer_Resolution
);
for
Each
of
Config
.
Other_Files
loop
Vec
:=
Vec
&
Each
;
end
loop
;
Tmpl_Map
(
"Other_Files"
,
Vec
);
Tmpl_Map
(
"Skeletons"
,
Config
.
Skeletons
);
Tmpl_Map
(
"Glue"
,
Config
.
Glue
);
Tmpl_Map
(
"Use_POHIC"
,
Config
.
Use_POHIC
);
Tmpl_Map
(
"Debug_Flag"
,
Config
.
Debug_Flag
);
Tmpl_Map
(
"Version"
,
Config
.
Version
);
Tmpl_Map
(
"Timer_Resolution"
,
Config
.
Timer_Resolution
);
Put_Line
(
Generate
(
Config
.
Binary_Path
.
all
&
"templates/configuration.tmplt"
));
Template
:=
Template
&
Assoc
(
"Other_Files"
,
Vec
);
Put_Line
(
Parse
(
Config
.
Binary_Path
.
all
&
"templates/configuration.tmplt"
,
Template
));
end
Debug_Dump
;
-----------------------
...
...
src/taste-parser_version.ads
View file @
89bf5a8b
package
TASTE
.
Parser_Version
is
Parser_Release
:
constant
String
:=
"
42f02f2
; Commit Date:
Mon
Jan 2
2
22:
54
:30 2018 "
;
"
d47249d
; Commit Date:
Tue
Jan 2
3
22:
13
:30 2018 "
;
Ocarina_Version
:
constant
String
:=
"Ocarina 2017.x (Working Copy from r0b92ed3)"
;
end
TASTE
.
Parser_Version
;
\ No newline at end of file
src/taste-templates.adb
deleted
100644 → 0
View file @
d47249dc
package
body
TASTE
.
Templates
is
procedure
New_Set
is
begin
Tmpl_Set
:=
Null_Set
;
end
New_Set
;
procedure
Tmpl_Map
(
Name
:
String
;
Value
:
String
)
is
begin
Tmpl_Set
:=
Tmpl_Set
&
Assoc
(
Name
,
Value
);
end
Tmpl_Map
;
procedure
Tmpl_Map
(
Name
:
String
;
Value
:
Boolean
)
is
begin
Tmpl_Set
:=
Tmpl_Set
&
Assoc
(
Name
,
Value
);
end
Tmpl_Map
;
procedure
Tmpl_Map
(
Name
:
String
;
Value
:
Unbounded_String
)
is
begin
Tmpl_Set
:=
Tmpl_Set
&
Assoc
(
Name
,
Value
);
end
Tmpl_Map
;
procedure
Tmpl_Map
(
Name
:
String
;
Value
:
Integer
)
is
begin
Tmpl_Set
:=
Tmpl_Set
&
Assoc
(
Name
,
Value
);
end
Tmpl_Map
;
procedure
Tmpl_Map
(
Name
:
String
;
Value
:
Tag
)
is
begin
Tmpl_Set
:=
Tmpl_Set
&
Assoc
(
Name
,
Value
);
end
Tmpl_Map
;
function
Generate
(
Template_Name
:
String
)
return
String
is
(
Parse
(
Template_Name
,
Tmpl_Set
));
begin
null
;
-- Don't change the separators, these could conflict with @@IF@@ syntax
-- Set_Tag_Separators (Start_With => "<",
-- Stop_With => ">");
end
TASTE
.
Templates
;
src/taste-templates.ads
deleted
100644 → 0
View file @
d47249dc
with
Ada
.
Strings
.
Unbounded
,
Templates_Parser
;
use
Ada
.
Strings
.
Unbounded
,
Templates_Parser
;
package
TASTE
.
Templates
is
procedure
New_Set
;
procedure
Tmpl_Map
(
Name
:
String
;
Value
:
String
);
procedure
Tmpl_Map
(
Name
:
String
;
Value
:
Boolean
);
procedure
Tmpl_Map
(
Name
:
String
;
Value
:
Unbounded_String
);
procedure
Tmpl_Map
(
Name
:
String
;
Value
:
Integer
);
procedure
Tmpl_Map
(
Name
:
String
;
Value
:
Tag
);
function
Generate
(
Template_Name
:
String
)
return
String
;
private
Tmpl_Set
:
Translate_Set
;
end
TASTE
.
Templates
;
test/test2/Makefile
View file @
89bf5a8b
...
...
@@ -4,6 +4,7 @@ all: test-parse
test-parse
:
$(AADL_PARSER)
--gw
\
-o
output
\
--glue
\
-i
InterfaceView.aadl
\
-c
DeploymentView.aadl
\
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment