mucgly 0.1.1 → 0.2.0

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Mucgly
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
     def Mucgly.version
         Mucgly::VERSION
     end

data/test/doit

@@ -0,0 +1,5 @@
+#!/bin/sh
+cd ..
+c-compile
+cd test
+gdb

data/test/golden/test_block.txt

@@ -0,0 +1,4 @@
+The blocked lines will not be visible in the output.
+This is the last line visible before block.
+This is the first line after block.
+Last line...

data/test/golden/test_multihook.txt

@@ -0,0 +1,4 @@
+typedef struct hookpair_s {
+  gchar* beg;                   /**< Hookbeg for input file. */
+  gchar* end;                   /**< Hookend for input file. */
+} hookpair_t;

data/test/golden/test_multihook_cli.txt

@@ -0,0 +1,4 @@
+typedef struct hookpair_s {
+  gchar* beg;                   /**< Hookbeg for input file. */
+  gchar* end;                   /**< Hookend for input file. */
+} hookpair_t;

data/test/result/test_block.txt

@@ -0,0 +1,4 @@
+The blocked lines will not be visible in the output.
+This is the last line visible before block.
+This is the first line after block.
+Last line...

data/test/result/test_multihook.txt

@@ -0,0 +1,4 @@
+typedef struct hookpair_s {
+  gchar* beg;                   /**< Hookbeg for input file. */
+  gchar* end;                   /**< Hookend for input file. */
+} hookpair_t;

data/test/result/test_multihook_cli.txt

@@ -0,0 +1,4 @@
+typedef struct hookpair_s {
+  gchar* beg;                   /**< Hookbeg for input file. */
+  gchar* end;                   /**< Hookend for input file. */
+} hookpair_t;

data/test/test_block.rx.txt

@@ -0,0 +1,11 @@
+The blocked lines will not be visible in the output.
+This is the last line visible before block.
+-<:block>-\
+Blocked line1.
+Blocked line2.
+Blocked line3.
+Blocked line4.
+Blocked line5.
+-<:unblock>-\
+This is the first line after block.
+Last line...

data/test/test_mucgly.rb

@@ -3,13 +3,14 @@ require 'test/unit'
 
 
 # Test execution routine.
-def runTest( cmdopts, test, sep = "" )
-    rf = "result/#{test}#{sep}.txt"
-    gf = "golden/#{test}#{sep}.txt"
+def runTest( cmdopts, test, sep = ".rx.txt" )
+    rf = "result/#{test}.txt"
+    gf = "golden/#{test}.txt"
 
-    system( "export RUBYLIB=../lib; ../bin/mucgly -i -m #{cmdopts} -f #{test}.rx.txt -o #{rf}" )
+    system( "export RUBYLIB=../lib; ../bin/mucgly -i -m #{cmdopts} -f #{test}#{sep} -o #{rf}" )
 
     if false
+    # if true
         # Populate golden files after inspection.
         system( "cp #{rf} #{gf}" )
     end
@@ -44,4 +45,10 @@ class MucglyTest < Test::Unit::TestCase
         assert( system( "diff #{rf2} #{gf2}" ), "FAILED: diff #{rf2} #{gf2}" )
     end
 
+    def test_block() runTest( "", "test_block" ); end
+
+    def test_multihook() runTest( "", "test_multihook", ".rx.c" ); end
+
+    def test_multihook_cli() runTest( "-u '/*..' -u '..*/' -u '_L/*' -u '_J*/'", "test_multihook_cli", ".rx.c" ); end
+
 end

data/test/test_multihook.rx.c

@@ -0,0 +1,17 @@
+-<+Mucgly.multihook( [ "/*..", "..*/", "_L/*", "_J*/" ] )>-
+/*..+@name="hookpair"..*/
+/*..+/Use the non-valid hookend within next macro for testing
+that is does not cause panic..*/
+typedef struct _L/*Mucgly.write(@name); %Q{..*/} _J*/_s {
+  gchar* beg;                   /**< Hookbeg for input file. */
+  gchar* end;                   /**< Hookend for input file. */
+} hookpair_t;
+/*..+:block..*/
+
+//_J*/
+
+typedef struct filestack_s {
+  GList* file;           /**< Stack of files. */
+} filestack_t;
+/*..+:unblock..*/
+/*..+:block..*/

data/test/test_multihook_cli.rx.c

@@ -0,0 +1,16 @@
+/*..+@name="hookpair"..*/
+/*..+/Use the non-valid hookend within next macro for testing
+that is does not cause panic..*/
+typedef struct _L/*Mucgly.write(@name); %Q{..*/} _J*/_s {
+  gchar* beg;                   /**< Hookbeg for input file. */
+  gchar* end;                   /**< Hookend for input file. */
+} hookpair_t;
+/*..+:block..*/
+
+//_J*/
+
+typedef struct filestack_s {
+  GList* file;           /**< Stack of files. */
+} filestack_t;
+/*..+:unblock..*/
+/*..+:block..*/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mucgly
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Tero Isannainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies: []
 description: |-
   Mucgly is a macro expander for inline macros that exist in the middle
@@ -46,22 +46,32 @@ files:
 - ext/mucgly/extconf.rb
 - ext/mucgly/mucgly.c
 - lib/version.rb
+- test/doit
 - test/golden/test_basic.txt
+- test/golden/test_block.txt
 - test/golden/test_file_ctrl.txt
+- test/golden/test_multihook.txt
+- test/golden/test_multihook_cli.txt
 - test/golden/test_redirect.txt
 - test/golden/test_specials_cli.txt
 - test/golden/test_specials_cmd.txt
 - test/result/test_basic.txt
+- test/result/test_block.txt
 - test/result/test_file_ctrl.txt
+- test/result/test_multihook.txt
+- test/result/test_multihook_cli.txt
 - test/result/test_redirect.txt
 - test/result/test_specials_cli.txt
 - test/result/test_specials_cmd.txt
 - test/result/test_specials_cmd2.txt
 - test/test_basic.rx.txt
+- test/test_block.rx.txt
 - test/test_file_ctrl.rx.txt
 - test/test_include.rb
 - test/test_include.txt
 - test/test_mucgly.rb
+- test/test_multihook.rx.c
+- test/test_multihook_cli.rx.c
 - test/test_skip.txt
 - test/test_specials_cli.rx.txt
 - test/test_specials_cmd.rx.txt
@@ -91,11 +101,18 @@ specification_version: 4
 summary: Mucgly processes inline macros.
 test_files:
 - test/test_skip.txt
+- test/golden/test_block.txt
 - test/golden/test_basic.txt
 - test/golden/test_specials_cli.txt
+- test/golden/test_multihook_cli.txt
 - test/golden/test_file_ctrl.txt
+- test/golden/test_multihook.txt
 - test/golden/test_redirect.txt
 - test/golden/test_specials_cmd.txt
+- test/test_multihook_cli.rx.c
+- test/doit
+- test/test_multihook.rx.c
+- test/test_block.rx.txt
 - test/test_specials_cmd.rx.txt
 - test/test_include.rb
 - test/test_include.txt
@@ -103,9 +120,12 @@ test_files:
 - test/test_specials_cli.rx.txt
 - test/test_mucgly.rb
 - test/test_file_ctrl.rx.txt
+- test/result/test_block.txt
 - test/result/test_basic.txt
 - test/result/test_specials_cli.txt
+- test/result/test_multihook_cli.txt
 - test/result/test_file_ctrl.txt
+- test/result/test_multihook.txt
 - test/result/test_specials_cmd2.txt
 - test/result/test_redirect.txt
 - test/result/test_specials_cmd.txt