Merge pull request #58 from BrainBlasted/cdavis/markdownToHTML

Move markdownToHTML functions and parse to lib

Author: kivikakk

src/koino.zig

@@ -1,4 +1,37 @@
+const std = @import("std");
+
 pub const parser = @import("parser.zig");
 pub const Options = @import("options.zig").Options;
 pub const nodes = @import("nodes.zig");
 pub const html = @import("html.zig");
+
+/// Performs work using internalAllocator, and writes the result to a Writer.
+fn markdownToHtmlInternal(writer: anytype, internalAllocator: std.mem.Allocator, markdown: []const u8, options: Options) !void {
+    var doc = try parse(internalAllocator, markdown, options);
+    defer doc.deinit();
+
+    try html.print(writer, internalAllocator, options, doc);
+}
+
+/// Parses Markdown into an AST.  Use `deinit()' on the returned document to free memory.
+pub fn parse(internalAllocator: std.mem.Allocator, markdown: []const u8, options: Options) !*nodes.AstNode {
+    var p = try parser.Parser.init(internalAllocator, options);
+    defer p.deinit();
+    try p.feed(markdown);
+    return try p.finish();
+}
+
+/// Performs work with an ArenaAllocator backed by the page allocator, and allocates the result HTML with resultAllocator.
+pub fn markdownToHtml(resultAllocator: std.mem.Allocator, markdown: []const u8, options: Options) ![]u8 {
+    var result = std.ArrayList(u8).init(resultAllocator);
+    errdefer result.deinit();
+    try markdownToHtmlWriter(result.writer(), markdown, options);
+    return result.toOwnedSlice();
+}
+
+/// Performs work with an ArenaAllocator backed by the page allocator, and writes the result to a Writer.
+pub fn markdownToHtmlWriter(writer: anytype, markdown: []const u8, options: Options) !void {
+    var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
+    defer arena.deinit();
+    try markdownToHtmlInternal(writer, arena.allocator(), markdown, options);
+}

src/main.zig

@@ -136,44 +136,13 @@ fn enableExtension(extension: []const u8, options: *Options) !void {
     std.process.exit(1);
 }
 
-/// Performs work using internalAllocator, and writes the result to a Writer.
-fn markdownToHtmlInternal(writer: anytype, internalAllocator: std.mem.Allocator, options: Options, markdown: []const u8) !void {
-    var doc = try parse(internalAllocator, options, markdown);
-    defer doc.deinit();
-
-    try html.print(writer, internalAllocator, options, doc);
-}
-
-/// Parses Markdown into an AST.  Use `deinit()' on the returned document to free memory.
-pub fn parse(internalAllocator: std.mem.Allocator, options: Options, markdown: []const u8) !*nodes.AstNode {
-    var p = try Parser.init(internalAllocator, options);
-    defer p.deinit();
-    try p.feed(markdown);
-    return try p.finish();
-}
-
-/// Performs work with an ArenaAllocator backed by the page allocator, and allocates the result HTML with resultAllocator.
-pub fn markdownToHtml(resultAllocator: std.mem.Allocator, options: Options, markdown: []const u8) ![]u8 {
-    var result = std.ArrayList(u8).init(resultAllocator);
-    errdefer result.deinit();
-    try markdownToHtmlWriter(result.writer(), options, markdown);
-    return result.toOwnedSlice();
-}
-
-/// Performs work with an ArenaAllocator backed by the page allocator, and writes the result to a Writer.
-pub fn markdownToHtmlWriter(writer: anytype, options: Options, markdown: []const u8) !void {
-    var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
-    defer arena.deinit();
-    try markdownToHtmlInternal(writer, arena.allocator(), options, markdown);
-}
-
 /// Uses a GeneralPurposeAllocator for scratch work instead of an ArenaAllocator to aid in locating memory leaks.
 /// Result HTML is allocated by std.testing.allocator.
 pub fn testMarkdownToHtml(options: Options, markdown: []const u8) ![]u8 {
     var gpa = std.heap.GeneralPurposeAllocator(.{}){};
     defer _ = gpa.deinit();
 
-    var doc = try parse(gpa.allocator(), options, markdown);
+    var doc = try koino.parse(gpa.allocator(), markdown, options);
     defer doc.deinit();
 
     var result = std.ArrayList(u8).init(std.testing.allocator);