From baf874b5a76a1be02961e88f31da8fd97c4623f6 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 6 Oct 2015 13:21:37 -0400
Subject: dmd compiler warnings fixed
---
lib/sdp/ao_object_setter.d | 10 +++++-----
lib/sdp/ao_rgx.d | 22 +++++++++++-----------
lib/sdp/ao_scan_inserts.d | 2 +-
lib/sdp/sdp.d | 2 +-
4 files changed, 18 insertions(+), 18 deletions(-)
(limited to 'lib/sdp')
diff --git a/lib/sdp/ao_object_setter.d b/lib/sdp/ao_object_setter.d
index 050b606..f2abd7f 100644
--- a/lib/sdp/ao_object_setter.d
+++ b/lib/sdp/ao_object_setter.d
@@ -6,7 +6,7 @@ mixin template ObjectSetters() {
class ObjectAbstractSet {
import std.conv : to;
string[string] contents_comment(in string object) {
- string object_set[string];
+ string[string] object_set;
object_set["use"] = "comment";
object_set["of"] = "comment";
object_set["is"] = "comment";
@@ -22,7 +22,7 @@ mixin template ObjectSetters() {
in string lvn,
in string lcn,
) {
- string object_set[string];
+ string[string] object_set;
object_set["use"] = "content";
object_set["of"] = "para";
object_set["is"] = "heading";
@@ -44,7 +44,7 @@ mixin template ObjectSetters() {
in string indent_second,
in bool bullet
) {
- string object_set[string];
+ string[string] object_set;
object_set["use"] = "content";
object_set["of"] = "para";
object_set["is"] = type;
@@ -62,7 +62,7 @@ mixin template ObjectSetters() {
in string attrib,
in int ocn
) {
- string object_set[string];
+ string[string] object_set;
object_set["use"] = "content";
object_set["of"] = "block";
object_set["is"] = type;
@@ -77,7 +77,7 @@ mixin template ObjectSetters() {
in string ocn,
in string node
) {
- string object_set[string];
+ string[string] object_set;
object_set["use"] = "content";
object_set["of"] = "block";
object_set["is"] = type;
diff --git a/lib/sdp/ao_rgx.d b/lib/sdp/ao_rgx.d
index 755ba11..d8df52c 100644
--- a/lib/sdp/ao_rgx.d
+++ b/lib/sdp/ao_rgx.d
@@ -44,17 +44,17 @@ mixin template RgxInit() {
/*
** heading & paragraph operators
*/
- static heading = ctRegex!(`^:?([A-D1-4])[~]([a-z0-9_.-]*[?]?) `);
- static heading_marker = ctRegex!(`^:?([A-D1-4])[~]`);
- static heading_title = ctRegex!(`^:?[A-D1-4][~][a-z0-9_.-]*[?]?\s+(.+?)$`);
- static heading_all = ctRegex!(`^:?([A-D1-4])[~]([a-z0-9_.-]*[?]?)\s+(.+?)$`); // test, particularly [2] name/hashtag which may or may not be, does this affect title [3]
- static heading_biblio = ctRegex!(`^:?(1)[~][!](biblio(?:graphy)?|references?)`);
- static heading_glossary = ctRegex!(`^:?(1)[~][!](glossary)`);
- static para_bullet = ctRegex!(`^_[*] `);
- static para_bullet_indent = ctRegex!(`^_([1-9])[*] `);
- static para_indent = ctRegex!(`^_([1-9]) `);
- static para_indent_hang = ctRegex!(`^_([0-9])_([0-9]) `);
- static para_attribs = ctRegex!(`^_(([0-9])(_([0-9]))?|_([1-9])?[*]) `);
+ static heading = ctRegex!(`^:?([A-D1-4])[~]([a-z0-9_.-]*[?]?) `);
+ static heading_marker = ctRegex!(`^:?([A-D1-4])[~]`);
+ static heading_title = ctRegex!(`^:?[A-D1-4][~][a-z0-9_.-]*[?]?\s+(.+?)$`);
+ static heading_all = ctRegex!(`^:?([A-D1-4])[~]([a-z0-9_.-]*[?]?)\s+(.+?)$`); // test, particularly [2] name/hashtag which may or may not be, does this affect title [3]
+ static heading_biblio = ctRegex!(`^:?(1)[~][!](biblio(?:graphy)?|references?)`);
+ static heading_glossary = ctRegex!(`^:?(1)[~][!](glossary)`);
+ static para_bullet = ctRegex!(`^_[*] `);
+ static para_bullet_indent = ctRegex!(`^_([1-9])[*] `);
+ static para_indent = ctRegex!(`^_([1-9]) `);
+ static para_indent_hang = ctRegex!(`^_([0-9])_([0-9]) `);
+ static para_attribs = ctRegex!(`^_(([0-9])(_([0-9]))?|_([1-9])?[*]) `);
/*
** blocked markup tics
*/
diff --git a/lib/sdp/ao_scan_inserts.d b/lib/sdp/ao_scan_inserts.d
index e99222a..9111076 100644
--- a/lib/sdp/ao_scan_inserts.d
+++ b/lib/sdp/ao_scan_inserts.d
@@ -109,7 +109,7 @@ mixin template SiSUdocInserts() {
return t;
}
auto scan_doc_source(char[][] markup_sourcefile_content, string fn_src) {
- char[] cont_arbitrary_max_length_set[100000]; // 2000 pg * 50 lines
+ char[][100000] cont_arbitrary_max_length_set; // 2000 pg * 50 lines
string[string] processing;
uint[string] line_occur;
auto obj_im = new ObjInlineMarkup();
diff --git a/lib/sdp/sdp.d b/lib/sdp/sdp.d
index 3bfbc5b..27fb169 100644
--- a/lib/sdp/sdp.d
+++ b/lib/sdp/sdp.d
@@ -31,7 +31,7 @@ import
lib.sdp.ao_utils; // ao_utils.d
import std.conv : to;
mixin RgxInit; mixin Interfaces; mixin Emitters;
-void main(string argv[]) {
+void main(string[] argv) {
mixin SiSUheader;
mixin SiSUbiblio;
mixin SiSUrgxInitFlags;
--
cgit v1.2.3