redsnow 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 471d343f32c079a7420b9cc9df8377700bd15628
-  data.tar.gz: a61fbc9b75a3a19ffae82cbb93e7f1573c23ba3b
+  metadata.gz: a54dde4bcbcf36bbd37d5f863e51b16bb247232a
+  data.tar.gz: 79fecb4a236ff45e54942a3da1f871088f9aba6c
 SHA512:
-  metadata.gz: add98cc11868851a984d68c173c0659d0f800ffecfc546c1ef2e9179998c90845a32f5efae4b829381e50daa784e8bc69087b00b29f737b69f5b0590a87b33b6
-  data.tar.gz: 7fc7d2a681eef08c8655cd9bf489e77ca1b0fbaea4d5449287fd6d5acfa257fd9b29d99963cb8182f926e14675ded8f6b000c9526bc33537d038d266ddd48e3f
+  metadata.gz: 9854dd4d2376d9fe8edc14791390d86a60ec973790809400c21820cf429f6fa9e08b81e13bbe1b9e21c17a7308d105d8b68f70f5d8763a6ba3ddf734bacd5657
+  data.tar.gz: bc9ed83bc8b1e0fe7a339b7c282c08740254d75490c92ec4a05e48b00134490f5b90ce095e8715ce96a2780fac71cd557463a09be7380fc83b3b51ac2e31b416

data/CHANGELOG.md

@@ -1,4 +1,6 @@
 # Changelog
+- 0.2.0
+    - New Parser Architecture [Snow Crash v0.14.0](https://github.com/apiaryio/snowcrash/releases)
 - 0.1.6
     - Fixing problem with submodules in Gem install [IS#25](https://github.com/apiaryio/redsnow/issues/25)
 - 0.1.5

data/ext/snowcrash/Makefile

@@ -56,7 +56,7 @@ ifdef INTEGRATION_TESTS
 endif
 
 perf: perf-libsnowcrash
-	$(BUILD_DIR)/out/$(BUILDTYPE)/perf-libsnowcrash ./test/performance/fixtures/fixture-1.md
+	$(BUILD_DIR)/out/$(BUILDTYPE)/perf-libsnowcrash ./test/performance/fixtures/fixture-1.apib
 
 install: snowcrash
 	cp -f $(BUILD_DIR)/out/$(BUILDTYPE)/snowcrash $(DESTDIR)/snowcrash

data/ext/snowcrash/configure

@@ -36,7 +36,7 @@ parser.add_option("--shared",
     dest="shared",
     help="Build and use shared libsnowcrash instead of static one.")
 
-parser.add_option("--include-integration-tests",
+parser.add_option("-i", "--include-integration-tests",
     action="store_true",
     dest="include_integration_tests",
     help="Configure for integration testing using Cucumber")
@@ -45,7 +45,7 @@ parser.add_option("--include-integration-tests",
 
 def write(filename, data):
   filename = os.path.join(root_dir, filename)
-  print "creating ", filename
+  print("creating " + filename)
   f = open(filename, 'w+')
   f.write(data)
 
@@ -58,12 +58,12 @@ def cc_macros():
                          stdout=subprocess.PIPE,
                          stderr=subprocess.PIPE)
   except OSError:
-    print '''Configure error: No acceptable C compiler found!
+    print('''Configure error: No acceptable C compiler found!
 
         Please make sure you have a C compiler installed on your system and/or
         consider adjusting the CC environment variable if you installed
         it in a non-standard prefix.
-        '''
+        ''')
     sys.exit()
 
   p.stdin.write('\n')
@@ -129,7 +129,7 @@ def configure_snowcrash(o):
 #
 # TODO: use bundle check
 if options.include_integration_tests:
-    print "Installing dependencies for integration tests..."
+    print("Installing dependencies for integration tests...")
     try:
         if sys.platform == 'win32':
             subprocess.call(["bundle.bat", "install"])
@@ -139,9 +139,9 @@ if options.include_integration_tests:
         if e.errno == os.errno.ENOENT:
             raise RuntimeError(
                 "Integration test dependecies rely on Ruby Bundler "
-                "but it cannot be find in the system $PATH. "
+                "but it cannot be found in the system $PATH. "
                 "Please make sure to install Bundler or/and to "
-                "add it to the $PATH."
+                "add it to the $PATH. E.g.: by running `sudo gem install bundler`"
             )
         else:
             raise
@@ -188,7 +188,7 @@ write('config.mk',
 #
 # Gyp call
 #
-print "creating makefiles"
+print("creating makefiles")
 
 gyp_args = ['--generator-output', build_dir, '--depth', '.']
 if sys.platform == 'win32':
@@ -210,4 +210,4 @@ if os.path.exists(options_fn):
 subprocess.call([sys.executable, 'tools/gyp/gyp_main.py'] + gyp_args)
 
 # All done
-print "All OK."
+print("All OK.")

data/ext/snowcrash/ext/markdown-parser/Makefile

@@ -0,0 +1,87 @@
+# Default Shell
+SHELL = /bin/bash
+
+# Default build path
+BUILD_PATH = build
+
+# Default C++ extension
+CXX_SRC_EXT = cc
+
+# Default C extension
+C_SRC_EXT = c
+
+# Markdown parser source directory
+SRC_PATH = src
+
+# Test source directory
+TEST_SRC_PATH = test
+
+# Sundown include paths
+SUNDOWN_INCLUDES = -Iext/sundown/src/ -Iext/sundown/html/
+
+# Markdown parser include paths
+INCLUDES = -I$(SRC_PATH) $(SUNDOWN_INCLUDES)
+
+# Test include paths
+TEST_INCLUDES = $(INCLUDES) -I$(TEST_SRC_PATH) -Itest/ext/Catch/single_include
+
+# Markdown parser objects
+LIB_SRC = $(shell find $(SRC_PATH)/ -name '*.$(CXX_SRC_EXT)')
+LIB_OBJ = $(LIB_SRC:$(SRC_PATH)/%.$(CXX_SRC_EXT)=$(BUILD_PATH)/%.o)
+LIB_DEPS = $(LIB_OBJ:.o=.d)
+
+# Sundown library objects
+SUNDOWN_SRC=\
+        ext/sundown/src/markdown.c \
+        ext/sundown/src/stack.c \
+        ext/sundown/src/buffer.c \
+        ext/sundown/src/autolink.c \
+        ext/sundown/src/src_map.c \
+        ext/sundown/html/html.c \
+        ext/sundown/html/html_smartypants.c \
+        ext/sundown/html/houdini_html_e.c \
+        ext/sundown/html/houdini_href_e.c
+SUNDOWN_OBJ = $(addprefix $(BUILD_PATH)/,$(addsuffix .o,$(basename $(SUNDOWN_SRC))))
+
+# Markdown parser tests object
+TEST_SRC = $(shell find $(TEST_SRC_PATH)/ -name '*.$(CXX_SRC_EXT)')
+TEST_OBJ = $(TEST_SRC:$(TEST_SRC_PATH)/%.$(CXX_SRC_EXT)=$(BUILD_PATH)/%.o)
+TEST_DEPS = $(TEST_OBJ:.o=.d)
+
+.PHONY: all
+all: libmarkdownparser.a test-libmarkdownparser libsundown.a	
+
+libsundown.a: $(SUNDOWN_OBJ) 
+	$(AR) rcs $(BUILD_PATH)/libsundown.a $^
+
+libmarkdownparser.a: $(LIB_OBJ)
+	$(AR) rcs $(BUILD_PATH)/libmarkdownparser.a $^
+
+test-libmarkdownparser: libmarkdownparser.a libsundown.a $(TEST_OBJ)
+	$(CXX) $(TEST_OBJ) $(BUILD_PATH)/libmarkdownparser.a $(BUILD_PATH)/libsundown.a $(LDFLAGS) -o $(BUILD_PATH)/$@
+
+.PHONY: test
+test: test-libmarkdownparser
+	$(BUILD_PATH)/test-libmarkdownparser
+
+.PHONY: clean
+clean:
+	$(RM) -r build
+	$(RM) -r bin
+
+$(BUILD_PATH)/%.o: $(SRC_PATH)/%.$(CXX_SRC_EXT)
+	$(CXX) $(CXXFLAGS) $(INCLUDES) -MP -MMD -c $< -o $@
+
+$(BUILD_PATH)/%.o: $(TEST_SRC_PATH)/%.$(CXX_SRC_EXT)
+	$(CXX) $(CXXFLAGS) $(TEST_INCLUDES) -MP -MMD -c $< -o $@	
+
+$(BUILD_PATH)/%.o: %.$(C_SRC_EXT)
+	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@	
+
+$(LIB_OBJ): | $(BUILD_PATH)
+$(SUNDOWN_OBJ): | $(BUILD_PATH)
+
+$(BUILD_PATH):
+	mkdir -p $(BUILD_PATH)
+	mkdir -p $(BUILD_PATH)/ext/sundown/src/
+	mkdir -p $(BUILD_PATH)/ext/sundown/html/

data/ext/snowcrash/{sundown → ext/markdown-parser/ext/sundown}/Makefile

@@ -27,6 +27,7 @@ CC=gcc
 SUNDOWN_SRC=\
 	src/markdown.o \
 	src/stack.o \
+	src/src_map.o \
 	src/buffer.o \
 	src/autolink.o \
 	html/html.o \
@@ -44,7 +45,7 @@ libsundown.so:	libsundown.so.1
 	ln -f -s $^ $@
 
 libsundown.so.1: $(SUNDOWN_SRC)
-	$(CC) $(LDFLAGS) -shared -Wl $^ -o $@
+	$(CC) $(LDFLAGS) -shared $^ -o $@
 
 # executables
 

data/ext/snowcrash/{sundown → ext/markdown-parser/ext/sundown}/src/buffer.h

@@ -28,7 +28,7 @@ extern "C" {
 
 #if defined(_MSC_VER)
 #define __attribute__(x)
-#define inline
+#define inline __inline
 #endif
 
 typedef enum {

data/ext/snowcrash/{sundown → ext/markdown-parser/ext/sundown}/src/markdown.c

@@ -1659,6 +1659,7 @@ parse_listitem(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t s
 	size_t beg = 0, end, pre, sublist = 0, orgpre = 0, i = 0;
 	int in_empty = 0, has_inside_empty = 0, in_fence = 0;
     src_map *item_map = NULL;
+    src_map *whole_item_map = NULL;
     
 	/* keeping track of the first indentation prefix */
 	while (orgpre < 3 && orgpre < size && data[orgpre] == ' ')
@@ -1793,7 +1794,7 @@ parse_listitem(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t s
             
             /* source map */
             if (item_map)
-                sublist_map = src_map_new_tail(item_map, sublist);
+                sublist_map = src_map_new_tail(item_map, sublist, -1);
             
 			parse_block(inter, rndr, work->data + sublist, work->size - sublist, sublist_map);
             
@@ -1811,7 +1812,7 @@ parse_listitem(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t s
             
             /* source map */
             if (item_map)
-                sublist_map = src_map_new_tail(item_map, sublist);
+                sublist_map = src_map_new_tail(item_map, sublist, -1);
 
 			parse_block(inter, rndr, work->data + sublist, work->size - sublist, sublist_map);
             
@@ -1828,10 +1829,15 @@ parse_listitem(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t s
     
     /* source map */
     if (item_map) {
+        range r = { orgpre, beg };
+
+        whole_item_map = src_map_new_tail(map, r.loc, r.len);
+        
         if (rndr->cb.block_did_parse)
-            rndr->cb.block_did_parse(item_map, data + i, size - i, rndr->opaque);
+            rndr->cb.block_did_parse(whole_item_map, data + i, size - i, rndr->opaque);
         
         src_map_release(item_map);
+        src_map_release(whole_item_map);
     }
 
 	rndr_popbuf(rndr, BUFFER_SPAN);

data/ext/snowcrash/{sundown → ext/markdown-parser/ext/sundown}/src/src_map.c

@@ -124,8 +124,8 @@ src_map_append(src_map *map, const range *r)
     if (map->size) {
         /* check continuous range */
         range *last_range = (range *)map->item[map->size - 1];
-        if (r->loc == last_range->loc + last_range->len) {
-            last_range->len += r->len;
+        if (r->loc <= last_range->loc + last_range->len) {
+            last_range->len += r->len - (last_range->loc + last_range->len - r->loc);
             return;
         }
     }
@@ -161,11 +161,12 @@ src_map_location(const src_map *map, size_t index)
 
 /* create new src_map from index onward */
 src_map *
-src_map_new_tail(const src_map *map, size_t index)
+src_map_new_tail(const src_map *map, size_t index, size_t maxlen)
 {
     size_t i = 0;
     size_t cur = 0;
     size_t first_item = -1;
+    size_t count = 0;
     src_map *new_map = NULL;
     
     if (!map ||
@@ -187,13 +188,16 @@ src_map_new_tail(const src_map *map, size_t index)
     
     /* create new map */
     new_map = src_map_new();
-    
-	for (i = first_item; i < map->size; ++i) {
-        
+	for (i = first_item; i < map->size && count < maxlen; ++i) {
+
         range *it = (range *)map->item[i];
         range *add_range = range_new(it->loc, it->len);
-        stack_push(new_map, add_range);
         
+        if (count + it->len > maxlen) {
+            add_range->len = maxlen - count;
+        }
+        count += it->len;
+        stack_push(new_map, add_range);   
     }
     
     return new_map;

data/ext/snowcrash/{sundown → ext/markdown-parser/ext/sundown}/src/src_map.h

@@ -42,7 +42,7 @@ void src_map_release(src_map *map);
 src_map *src_map_new_submap(const src_map *map, const range *r);
 
 /* src_map_new_tail: create map from tail of map */
-src_map *src_map_new_tail(const src_map *map, size_t index);
+src_map *src_map_new_tail(const src_map *map, size_t index, size_t maxlen);
     
 /* src_map_append: append range to source map */
 void src_map_append(src_map *map, const range *r);

data/ext/snowcrash/ext/markdown-parser/msvc/markdown/markdown.vcproj

@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="markdown"
+	ProjectGUID="{288550BA-B6D6-4254-B5E3-9E8CE20970AE}"
+	RootNamespace="markdown"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\..\build\debug"
+			IntermediateDirectory="..\..\build\data\markdown\debug"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\ext\sundown\src"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\..\build\release"
+			IntermediateDirectory="..\..\build\data\markdown\release"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\ext\sundown\src"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\src\ByteBuffer.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\MarkdownNode.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\MarkdownParser.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\src\ByteBuffer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\MarkdownNode.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\MarkdownParser.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>