From 1cc6a04b8bce82fa83b62d919bf8bdf14cad0b92 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 1 Oct 2016 13:54:14 -0400
Subject: update sdlang, start looking to using dub remote dependencies

---
 src/sdp/ao_conf_make_meta_sdlang.d |  2 +-
 src/sdp/ao_object_setter.d         | 34 +++++++++++++++++-----------------
 src/sdp/ao_output_debugs.d         |  4 +---
 src/sdp/ao_read_config_files.d     |  2 +-
 4 files changed, 20 insertions(+), 22 deletions(-)

(limited to 'src/sdp')

diff --git a/src/sdp/ao_conf_make_meta_sdlang.d b/src/sdp/ao_conf_make_meta_sdlang.d
index 9124697..1cc3498 100644
--- a/src/sdp/ao_conf_make_meta_sdlang.d
+++ b/src/sdp/ao_conf_make_meta_sdlang.d
@@ -195,7 +195,7 @@ template SiSUheaderExtractSDLang() {
       try {
         sdl_root_header = parseSource(src_header);
       }
-      catch(SDLangParseException e) {
+      catch(ParseException e) {
         stderr.writeln("SDLang problem with this document header:");
         stderr.writeln(src_header);
         // Error messages of the form:
diff --git a/src/sdp/ao_object_setter.d b/src/sdp/ao_object_setter.d
index cbb4edc..745de4e 100644
--- a/src/sdp/ao_object_setter.d
+++ b/src/sdp/ao_object_setter.d
@@ -5,35 +5,35 @@
 template ObjectSetter() {
   /+ structs +/
   struct HeadingAttrib {
-    string lev                = "9";
-    int lev_markup_number     = 9;
-    int lev_collapsed_number  = 9;
+    string lev                  = "9";
+    int lev_markup_number       = 9;
+    int lev_collapsed_number    = 9;
   }
   struct ParaAttrib {
-    int indent_start          = 0;
-    int indent_rest           = 0;
-    bool bullet               = false;
+    int indent_start            = 0;
+    int indent_rest             = 0;
+    bool bullet                 = false;
   }
   struct BlockAttrib {
-    string syntax                 = "";
+    string syntax               = "";
   }
   struct Comment {
     // no .attrib and no .obj_cite_number
   }
   struct Node {
-    int ocn                    = 0;
-    int parent_lev             = 0;
-    int parent_ocn             = 0;
-    string node                = "";
+    int ocn                     = 0;
+    int parent_lev              = 0;
+    int parent_ocn              = 0;
+    string node                 = "";
   }
   struct ObjComposite {
     // size_t id;
-    string use                 = "";
-    string of                  = "";
-    string is_a                = "";
-    string object              = "";
-    string obj_cite_number     = "";  // not used for calculations? output only? else int
-    string[] anchor_tags       = [];
+    string use                  = "";
+    string of                   = "";
+    string is_a                 = "";
+    string object               = "";
+    string obj_cite_number      = "";  // not used for calculations? output only? else int
+    string[] anchor_tags        = [];
     HeadingAttrib heading_attrib;
     ParaAttrib para_attrib;
     BlockAttrib block_attrib;
diff --git a/src/sdp/ao_output_debugs.d b/src/sdp/ao_output_debugs.d
index 1bf359a..b5f96fa 100644
--- a/src/sdp/ao_output_debugs.d
+++ b/src/sdp/ao_output_debugs.d
@@ -383,10 +383,8 @@ template SiSUoutputDebugs() {
           }
         }
         writefln(
-          "%s%s%s\n%s\n%s%s\n%s%s\n%s%s\n%s:%s",
-          scr_txt_color["green"],
+          "%s\n%s\n%s%s\n%s%s\n%s%s\n%s:%s",
           "-------------------------------",
-          scr_txt_color["off"],
           fn_src,
           "length contents array: ",
           contents.length,
diff --git a/src/sdp/ao_read_config_files.d b/src/sdp/ao_read_config_files.d
index 571dbcc..49efe7b 100644
--- a/src/sdp/ao_read_config_files.d
+++ b/src/sdp/ao_read_config_files.d
@@ -80,7 +80,7 @@ template SiSUconfigSDLang() {
       try {
         sdl_root_conf = parseSource(configuration);
       }
-      catch(SDLangParseException e) {
+      catch(ParseException e) {
         stderr.writeln("SDLang problem with content for ", conf_sdl_filename);
         // Error messages of the form:
         // myFile.sdl(5:28): Error: Invalid integer suffix.
-- 
cgit v1.2.3