rmultimarkdown 6.4.0.4 → 6.7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 127d1e5c1221988395dc6e51c19c047c5924a683
-  data.tar.gz: d1af5d92f539074b8f8da37430a97067e0ba0e16
+SHA256:
+  metadata.gz: '082f8def907eba9f90a7ba7dc44c18adf0fd84c661d22cb64d3e79e8d1289a07'
+  data.tar.gz: 6848474690afdd2f99a96db3e552180c23a584a1509f66a39a7e0aac5432fa8b
 SHA512:
-  metadata.gz: 07d5879bb8422e502586faf6e1d54cdb3afe30a6c6e006800cfb9ec17269a2d8584eae6080f42597d42510a50947917b7a176043a4831b8ed7190de6d85a5c84
-  data.tar.gz: 462866bff176ec198f5592be2108578d502053c7e78910f9f345a5d6d833c1d9bc18133748b1672335dc01520d0cf177f3d8b479f234e3cdc60ee0631c9617f3
+  metadata.gz: 5b4dc5b9763f3ba60de2abcd8d3c6ec14368579e4cc492d43a37adb036a9dde4fbe0f00893e462ff6418aa9f97d020dd659e6ea93d09232ca758289c8004fed2
+  data.tar.gz: 4db801524d1df6639793e91942ef8ddf8de2c68112c3946d087d9ab8d0aa6d8eb83e3d129380f52dc358177a254295342e040ae4bf95f22a53f1a2d4333c3d34

data/Rakefile

@@ -2,6 +2,7 @@ require 'rake/clean'
 require 'rdoc/task'
 require 'bundler'
 require 'fileutils'
+require 'rake/testtask'
 
 Bundler::GemHelper.install_tasks
 
@@ -26,23 +27,16 @@ namespace "MultiMarkdown-6" do
       sh 'make' # creates build/version.h
 
       # Copy all c and h files to MMD_DIR which will be released in the gem
-      ['Sources/libMultiMarkdown', 'build'].each do |dir|
+      ['src', 'build'].each do |dir|
         chdir(dir) do
           Dir.glob('{.,include}/*.{h,c}').each do |s|
-            next if s =~ /template/
+            next if s =~ /template|char_lookup/
             dest = "#{MMD_DIR}/#{File.dirname(s)}"
             FileUtils.mkdir_p(dest)
             FileUtils.cp(s, dest)
           end
         end
       end
-
-      # We have to disable the ObjectPool. see include/token.h
-      token_h_file = "#{MMD_DIR}/include/token.h"
-      IO.write(token_h_file, (File.open(token_h_file) { |f|
-        f.read.gsub(/#define kUseObjectPool/, "#define kUseObjectPoolDisabled")
-      }))
-
     end
   end
 
@@ -78,10 +72,10 @@ task :test => [ 'test:unit', 'test:conformance' ]
 namespace :test do
 
   desc 'Run unit tests'
-  task :unit => :build do |t|
-    FileList['test/*_test.rb'].each do |f|
-      ruby f
-    end
+  Rake::TestTask.new(:unit => :build) do |t|
+    t.libs << 'lib'
+    t.libs << 'test'
+    t.test_files = FileList['test/**/*_test.rb']
   end
 
   desc "Run conformance tests"

data/ext/Makefile

@@ -3,21 +3,22 @@ SHELL = /bin/sh
 
 # V=0 quiet, V=1 verbose.  other values don't work.
 V = 0
+V0 = $(V:0=)
 Q1 = $(V:1=)
 Q = $(Q1:0=@)
-ECHO1 = $(V:1=@:)
-ECHO = $(ECHO1:0=@echo)
+ECHO1 = $(V:1=@ :)
+ECHO = $(ECHO1:0=@ echo)
 NULLCMD = :
 
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /opt/rubies/ruby-2.3.1/include/ruby-2.3.0
+topdir = /opt/rubies/ruby-3.4.3/include/ruby-3.4.0
 hdrdir = $(topdir)
-arch_hdrdir = /opt/rubies/ruby-2.3.1/include/ruby-2.3.0/x86_64-darwin14
+arch_hdrdir = /opt/rubies/ruby-3.4.3/include/ruby-3.4.0/arm64-darwin24
 PATH_SEPARATOR = :
 VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = $(DESTDIR)/opt/rubies/ruby-2.3.1
+prefix = $(DESTDIR)/opt/rubies/ruby-3.4.3
 rubysitearchprefix = $(rubylibprefix)/$(sitearch)
 rubyarchprefix = $(rubylibprefix)/$(arch)
 rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
@@ -41,6 +42,7 @@ archincludedir = $(includedir)/$(arch)
 sitearchlibdir = $(libdir)/$(sitearch)
 archlibdir = $(libdir)/$(arch)
 ridir = $(datarootdir)/$(RI_BASE_NAME)
+modular_gc_dir = $(DESTDIR)
 mandir = $(datarootdir)/man
 localedir = $(datarootdir)/locale
 libdir = $(exec_prefix)/lib
@@ -52,6 +54,7 @@ infodir = $(datarootdir)/info
 docdir = $(datarootdir)/doc/$(PACKAGE)
 oldincludedir = $(DESTDIR)/usr/include
 includedir = $(SDKROOT)$(prefix)/include
+runstatedir = $(localstatedir)/run
 localstatedir = $(prefix)/var
 sharedstatedir = $(prefix)/com
 sysconfdir = $(prefix)/etc
@@ -63,56 +66,62 @@ bindir = $(exec_prefix)/bin
 archdir = $(rubyarchdir)
 
 
+CC_WRAPPER = 
 CC = clang
 CXX = clang++
-LIBRUBY = $(LIBRUBY_A)
+LIBRUBY = $(LIBRUBY_SO)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = 
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static -framework CoreFoundation
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static -framework CoreFoundation $(MAINLIBS)
 empty =
 OUTFLAG = -o $(empty)
 COUTFLAG = -o $(empty)
+CSRCFLAG = $(empty)
 
 RUBY_EXTCONF_H = extconf.h
-cflags   =  $(optflags) $(debugflags) $(warnflags)
-cxxflags =  $(optflags) $(debugflags) $(warnflags)
+cflags   = $(hardenflags) -fdeclspec  $(optflags) $(debugflags) $(warnflags)
+cxxflags = 
 optflags = -O3 -fno-fast-math
 debugflags = -ggdb3
-warnflags = -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration -Wdivision-by-zero -Wdeprecated-declarations -Wextra-tokens
+warnflags = -Wall -Wextra -Wextra-tokens -Wdeprecated-declarations -Wdivision-by-zero -Wdiv-by-zero -Wimplicit-function-declaration -Wimplicit-int -Wpointer-arith -Wshorten-64-to-32 -Wwrite-strings -Wold-style-definition -Wmissing-noreturn -Wno-cast-function-type -Wno-constant-logical-operand -Wno-long-long -Wno-missing-field-initializers -Wno-overlength-strings -Wno-parentheses-equality -Wno-self-assign -Wno-tautological-compare -Wno-unused-parameter -Wno-unused-value -Wunused-variable -Wmisleading-indentation -Wundef
+cppflags = 
 CCDLFLAGS = -fno-common
-CFLAGS   = $(CCDLFLAGS)  -O3 -Wno-error=shorten-64-to-32  -pipe -fbracket-depth=512 -DNDEBUG=1 $(ARCH_FLAG)
+CFLAGS   = $(CCDLFLAGS) $(cflags) -fno-common -pipe -fbracket-depth=512  -DNDEBUG=1 -DDISABLE_OBJECT_POOL $(ARCH_FLAG)
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     = 
-CPPFLAGS = -DRUBY_EXTCONF_H=\"$(RUBY_EXTCONF_H)\" -I/Users/tillsc/github/tillsc/multi_markdown/ext/mmd -I/Users/tillsc/github/tillsc/multi_markdown/ext/mmd/include -I/usr/include -I/opt/rubies/ruby-2.3.1/include  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT $(DEFS) $(cppflags)
-CXXFLAGS = $(CCDLFLAGS) $(cxxflags) -fbracket-depth=512 -DNDEBUG=1 $(ARCH_FLAG)
-ldflags  = -L. -L/opt/rubies/ruby-2.3.1/lib  -fstack-protector -L/usr/local/lib
-dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress 
-ARCH_FLAG = 
+CPPFLAGS = -DRUBY_EXTCONF_H=\"$(RUBY_EXTCONF_H)\" -I/Users/tillsc/github/tillsc/multi_markdown/ext/mmd -I/opt/rubies/ruby-3.4.3/include -I/usr/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT $(DEFS) $(cppflags)
+CXXFLAGS = $(CCDLFLAGS) -fdeclspec -fbracket-depth=512  -DNDEBUG=1 -DDISABLE_OBJECT_POOL $(ARCH_FLAG)
+ldflags  = -L. -fstack-protector-strong
+dldflags = -Wl,-undefined,dynamic_lookup 
+ARCH_FLAG = -arch arm64
 DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
 LDSHARED = $(CC) -dynamic -bundle
 LDSHAREDXX = $(CXX) -dynamic -bundle
+POSTLINK = dsymutil $@ 2>/dev/null; { test -z '$(RUBY_CODESIGN)' || codesign -s '$(RUBY_CODESIGN)' $@; }
 AR = ar
+LD = ld
 EXEEXT = 
 
 RUBY_INSTALL_NAME = $(RUBY_BASE_NAME)
-RUBY_SO_NAME = ruby
+RUBY_SO_NAME = ruby.3.4
 RUBYW_INSTALL_NAME = 
 RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
 RUBYW_BASE_NAME = rubyw
 RUBY_BASE_NAME = ruby
 
-arch = x86_64-darwin14
+arch = arm64-darwin24
 sitearch = $(arch)
-ruby_version = 2.3.0
+ruby_version = 3.4.0
 ruby = $(bindir)/$(RUBY_BASE_NAME)
 RUBY = $(ruby)
-ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/ruby.h $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/missing.h $(hdrdir)/ruby/intern.h $(hdrdir)/ruby/st.h $(hdrdir)/ruby/subst.h $(arch_hdrdir)/ruby/config.h $(RUBY_EXTCONF_H)
+BUILTRUBY = $(bindir)/$(RUBY_BASE_NAME)
+ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/backward.h $(hdrdir)/ruby/ruby.h $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/missing.h $(hdrdir)/ruby/intern.h $(hdrdir)/ruby/st.h $(hdrdir)/ruby/subst.h $(arch_hdrdir)/ruby/config.h $(RUBY_EXTCONF_H)
 
 RM = rm -f
-RM_RF = $(RUBY) -run -e rm -- -rf
+RM_RF = rm -fr
 RMDIRS = rmdir -p
-MAKEDIRS = /usr/local/bin/gmkdir -p
-INSTALL = /usr/local/bin/ginstall -c
+MAKEDIRS = mkdir -p
+INSTALL = /usr/bin/install -c
 INSTALL_PROG = $(INSTALL) -m 0755
 INSTALL_DATA = $(INSTALL) -m 644
 COPY = cp
@@ -121,9 +130,8 @@ TOUCH = exit >
 #### End of system configuration section. ####
 
 preload = 
-
-libpath = . $(libdir) /opt/rubies/ruby-2.3.1/lib
-LIBPATH =  -L. -L$(libdir) -L/opt/rubies/ruby-2.3.1/lib
+libpath = . $(libdir) /opt/rubies/ruby-3.4.3/lib
+LIBPATH = -L. -L$(libdir) -L/opt/rubies/ruby-3.4.3/lib
 DEFFILE = 
 
 CLEANFILES = mkmf.log
@@ -134,11 +142,12 @@ extout =
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS =   -lpthread -lgmp -ldl -lobjc 
+LIBS = $(LIBRUBYARG_SHARED)  -lpthread  
 ORIG_SRCS = ruby_multi_markdown.c
-SRCS = $(ORIG_SRCS) memoir.c object_pool.c char_lookup.c textbundle.c miniz.c char.c writer.c beamer.c latex.c stack.c zip.c opendocument.c d_string.c lexer.c token.c transclude.c aho-corasick.c mmd.c uuid.c opml-reader.c html.c epub.c file.c critic_markup.c scanners.c opml-lexer.c parser.c opendocument-content.c opml-parser.c opml.c token_pairs.c rng.c ruby_multi_markdown.c
-OBJS = mmd/memoir.o mmd/object_pool.o mmd/char_lookup.o mmd/textbundle.o mmd/miniz.o mmd/char.o mmd/writer.o mmd/beamer.o mmd/latex.o mmd/stack.o mmd/zip.o mmd/opendocument.o mmd/d_string.o mmd/lexer.o mmd/token.o mmd/transclude.o mmd/aho-corasick.o mmd/mmd.o mmd/uuid.o mmd/opml-reader.o mmd/html.o mmd/epub.o mmd/file.o mmd/critic_markup.o mmd/scanners.o mmd/opml-lexer.o mmd/parser.o mmd/opendocument-content.o mmd/opml-parser.o mmd/opml.o mmd/token_pairs.o mmd/rng.o ruby_multi_markdown.o
+SRCS = $(ORIG_SRCS) aho-corasick.c argtable3.c beamer.c char.c critic_markup.c d_string.c epub.c file.c html.c itmz-lexer.c itmz-parser.c itmz-reader.c itmz.c latex.c lexer.c main.c memoir.c miniz.c mmd.c object_pool.c opendocument-content.c opendocument.c opml-lexer.c opml-parser.c opml-reader.c opml.c parser.c rng.c scanners.c stack.c textbundle.c token.c token_pairs.c transclude.c uuid.c writer.c xml.c zip.c ruby_multi_markdown.c
+OBJS = mmd/aho-corasick.o mmd/argtable3.o mmd/beamer.o mmd/char.o mmd/critic_markup.o mmd/d_string.o mmd/epub.o mmd/file.o mmd/html.o mmd/itmz-lexer.o mmd/itmz-parser.o mmd/itmz-reader.o mmd/itmz.o mmd/latex.o mmd/lexer.o mmd/main.o mmd/memoir.o mmd/miniz.o mmd/mmd.o mmd/object_pool.o mmd/opendocument-content.o mmd/opendocument.o mmd/opml-lexer.o mmd/opml-parser.o mmd/opml-reader.o mmd/opml.o mmd/parser.o mmd/rng.o mmd/scanners.o mmd/stack.o mmd/textbundle.o mmd/token.o mmd/token_pairs.o mmd/transclude.o mmd/uuid.o mmd/writer.o mmd/xml.o mmd/zip.o ruby_multi_markdown.o
 HDRS = $(srcdir)/extconf.h
+LOCAL_HDRS = 
 TARGET = multi_markdown
 TARGET_NAME = multi_markdown
 TARGET_ENTRY = Init_$(TARGET_NAME)
@@ -151,15 +160,16 @@ BINDIR        = $(bindir)
 RUBYCOMMONDIR = $(sitedir)$(target_prefix)
 RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
 RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
-ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
-
-TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).bundle 
-CLEANOBJS     = *.o  *.bak
+HDRDIR        = $(sitehdrdir)$(target_prefix)
+ARCHHDRDIR    = $(sitearchhdrdir)$(target_prefix)
+TARGET_SO_DIR =
+TARGET_SO     = $(TARGET_SO_DIR)$(DLLIB)
+CLEANLIBS     = $(TARGET_SO) $(TARGET_SO:=.dSYM)
+CLEANOBJS     = $(OBJS) *.bak
+TARGET_SO_DIR_TIMESTAMP = $(TIMESTAMP_DIR)/.sitearchdir.time
 
 all:    $(DLLIB)
-static: $(STATIC_LIB) install-rb
+static: $(STATIC_LIB)
 .PHONY: all install static install-so install-rb
 .PHONY: clean clean-so clean-static clean-rb
 
@@ -168,7 +178,7 @@ clean-rb-default::
 clean-rb::
 clean-so::
 clean: clean-so clean-static clean-rb-default clean-rb
-		-$(Q)$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) .*.time
+		-$(Q)$(RM_RF) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) .*.time
 
 distclean-rb-default::
 distclean-rb::
@@ -182,17 +192,19 @@ distclean: clean distclean-so distclean-static distclean-rb-default distclean-rb
 realclean: distclean
 install: install-so install-rb
 
-install-so: $(DLLIB) $(TIMESTAMP_DIR)/.RUBYARCHDIR.time
+install-so: $(DLLIB) $(TARGET_SO_DIR_TIMESTAMP)
 	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
 clean-static::
 	-$(Q)$(RM) $(STATIC_LIB)
-install-rb: pre-install-rb install-rb-default
-install-rb-default: pre-install-rb-default
+install-rb: pre-install-rb do-install-rb install-rb-default
+install-rb-default: pre-install-rb-default do-install-rb-default
 pre-install-rb: Makefile
 pre-install-rb-default: Makefile
+do-install-rb:
+do-install-rb-default:
 pre-install-rb-default:
 	@$(NULLCMD)
-$(TIMESTAMP_DIR)/.RUBYARCHDIR.time:
+$(TARGET_SO_DIR_TIMESTAMP):
 	$(Q) $(MAKEDIRS) $(@D) $(RUBYARCHDIR)
 	$(Q) $(TOUCH) $@
 
@@ -204,53 +216,53 @@ site-install-rb: install-rb
 
 .cc.o:
 	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
 
 .cc.S:
 	$(ECHO) translating $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $<
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
 
 .mm.o:
 	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
 
 .mm.S:
 	$(ECHO) translating $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $<
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
 
 .cxx.o:
 	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
 
 .cxx.S:
 	$(ECHO) translating $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $<
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
 
 .cpp.o:
 	$(ECHO) compiling $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
 
 .cpp.S:
 	$(ECHO) translating $(<)
-	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $<
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
 
 .c.o:
 	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
 
 .c.S:
 	$(ECHO) translating $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -S $<
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
 
 .m.o:
 	$(ECHO) compiling $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
 
 .m.S:
 	$(ECHO) translating $(<)
-	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -S $<
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -S $(CSRCFLAG)$<
 
-$(DLLIB): $(OBJS) Makefile
+$(TARGET_SO): $(OBJS) Makefile
 	$(ECHO) linking shared-object $(DLLIB)
 	-$(Q)$(RM) $(@)
 	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)

data/ext/extconf.rb

@@ -4,16 +4,18 @@ LIBDIR      = RbConfig::CONFIG['libdir']
 INCLUDEDIR  = RbConfig::CONFIG['includedir']
 
 if RbConfig::CONFIG['CC'] == 'clang' || RbConfig::CONFIG['CC_VERSION_MESSAGE'].to_s.include?('clang')
-  $CFLAGS="#{$CFLAGS} -fbracket-depth=512 -DNDEBUG=1"
-  $CXXFLAGS="#{$CXXFLAGS} -fbracket-depth=512 -DNDEBUG=1"
+  $CFLAGS="#{$CFLAGS} -fbracket-depth=512"
+  $CXXFLAGS="#{$CXXFLAGS} -fbracket-depth=512"
 else
-  $CFLAGS="#{$CFLAGS} -std=c99 -DNDEBUG=1"
-  $CXXFLAGS="#{$CXXFLAGS} -std=c99 -DNDEBUG=1"
+  $CFLAGS="#{$CFLAGS} -std=c99"
+  $CXXFLAGS="#{$CXXFLAGS} -std=c99"
 end
 
+$CFLAGS  << '  -DNDEBUG=1 -DDISABLE_OBJECT_POOL'
+$CXXFLAGS << '  -DNDEBUG=1 -DDISABLE_OBJECT_POOL'
+
 HEADER_DIRS = [
   File.expand_path('../mmd', __FILE__),
-  File.expand_path('../mmd/include', __FILE__),
   INCLUDEDIR,
   '/usr/include'
 ]

data/ext/mmd/aho-corasick.c

@@ -157,7 +157,7 @@ bool trie_insert(trie * a, const char * key, unsigned short match_type) {
 
 
 #ifdef TEST
-void Test_trie_insert(CuTest* tc) {
+void Test_trie_insert(CuTest * tc) {
 	trie * a = trie_new(0);
 
 	CuAssertIntEquals(tc, kTrieStartingSize, a->capacity);
@@ -227,7 +227,7 @@ unsigned short trie_search_match_type(trie * a, const char * query) {
 
 
 #ifdef TEST
-void Test_trie_search(CuTest* tc) {
+void Test_trie_search(CuTest * tc) {
 	trie * a = trie_new(0);
 
 	trie_insert(a, "foo", 42);
@@ -309,7 +309,7 @@ void ac_trie_prepare(trie * a) {
 
 
 #ifdef TEST
-void Test_trie_prepare(CuTest* tc) {
+void Test_trie_prepare(CuTest * tc) {
 	trie * a = trie_new(0);
 
 	trie_insert(a, "a", 1);
@@ -478,9 +478,9 @@ void match_set_filter_leftmost_longest(match * header) {
 					m->next->start > m->start &&
 					m->next->start < m->start + m->len) {
 				// This match is "lefter" than next
-				#ifndef __clang_analyzer__
+#ifndef __clang_analyzer__
 				match_excise(m->next);
-				#endif
+#endif
 			}
 
 			while (m->next &&
@@ -497,9 +497,9 @@ void match_set_filter_leftmost_longest(match * header) {
 				m->prev->start >= m->start) {
 			// We are "lefter" than previous
 			n = m->prev;
-			#ifndef __clang_analyzer__
+#ifndef __clang_analyzer__
 			match_excise(n);
-			#endif
+#endif
 		}
 
 		m = m->next;
@@ -519,7 +519,7 @@ match * ac_trie_leftmost_longest_search(trie * a, const char * source, size_t st
 
 
 #ifdef TEST
-void Test_aho_trie_search(CuTest* tc) {
+void Test_aho_trie_search(CuTest * tc) {
 	trie * a = trie_new(0);
 
 	trie_insert(a, "foo", 42);

data/ext/mmd/aho-corasick.h

@@ -73,7 +73,7 @@ struct trie {
 	size_t				size;				// How many nodes are in use?
 	size_t				capacity;			// How many nodes can we hold
 
-	trie_node *			node;				// Pointer to stack of nodes
+	trie_node 	*		node;				// Pointer to stack of nodes
 };
 
 typedef struct trie trie;
@@ -83,8 +83,8 @@ struct match {
 	size_t				start;				// Starting offset for this match
 	size_t				len;				// Length for this match
 	unsigned short		match_type;			// Match type
-	struct match *		next;				// Pointer to next match in list
-	struct match *		prev;				// Pointer to previous match in list
+	struct match 	*	next;				// Pointer to next match in list
+	struct match 	*	prev;				// Pointer to previous match in list
 };
 
 typedef struct match match;