redsnow 0.3.7 → 0.4.0

data/ext/{snowcrash → drafter/ext/snowcrash}/src/SourceAnnotation.h

@@ -101,7 +101,7 @@ namespace snowcrash {
         NoError = 0,
         ApplicationError = 1,
         BusinessError = 2,
-        SymbolError = 3
+        ModelError = 3
     };
 
     /**
@@ -125,7 +125,8 @@ namespace snowcrash {
         DeprecatedWarning = 9,
         IndentationWarning = 10,
         AmbiguityWarning = 11,
-        URIWarning = 12
+        URIWarning = 12,
+        HTTPWarning = 13
     };
 
     /**

data/ext/{snowcrash → drafter/ext/snowcrash}/src/StringUtility.h

@@ -8,8 +8,8 @@
 //  Credits:
 //  http://stackoverflow.com/questions/216823/whats-the-best-way-to-trim-stdstring
 
-#ifndef SNOWCRAH_TRIMSTRING_H
-#define SNOWCRAH_TRIMSTRING_H
+#ifndef SNOWCRAH_STRINGUTILITY_H
+#define SNOWCRAH_STRINGUTILITY_H
 
 #include <algorithm>
 #include <functional>
@@ -18,6 +18,8 @@
 #include <string>
 #include <sstream>
 #include <vector>
+#include "RegexMatch.h"
+#include "MarkdownParser.h"
 
 namespace snowcrash {
 
@@ -125,7 +127,6 @@ namespace snowcrash {
         return elem.front();
     }
 
-
     /**
      *  \brief  compare equality  - allow compare diferent types
      *
@@ -151,9 +152,9 @@ namespace snowcrash {
     };
 
     /**
-     *  \brief  compare containers equality 
+     *  \brief  compare containers equality
      *
-     *  \requirements 
+     *  \requirements
      *    - both containers must support methods ::length(), ::begin(), ::end()
      *    - both containers must be iterable
      *    - both containers must contain comparable types
@@ -171,7 +172,7 @@ namespace snowcrash {
         }
         return std::equal(arg1.begin(), arg1.end(), arg2.begin(), predicate);
     }
-    
+
     template <typename T>
     struct Equal : std::binary_function<T, T, bool> {
         bool operator()(const T& left, const T& right) const {
@@ -186,6 +187,102 @@ namespace snowcrash {
         }
     };
 
+    /**
+     * \brief Retrieve the string enclosed by the given matching escaping characters
+     *
+     *        Please note that the subject will be stripped of the escaped string
+     *        and the characters before it
+     *
+     * \param subject String that needs to be parsed
+     * \param begin Character representing the beginning of the escaped string
+     * \param stripEscapeChars If true, strip the escape characters from the result string
+     *
+     * \return Returns the escaped string
+     *
+     * \example (begin = 1, subject = "a```b```cd") ----> (return = "```b```", subject = "cd")
+     */
+    inline std::string RetrieveEscaped(std::string& subject,
+                                       size_t begin = 0,
+                                       const bool stripEscapeChars = false) {
+
+        size_t levels = 0;
+        const char escapeChar = subject[begin];
+
+        // Get the level of the backticks
+        while (subject[levels + begin] == escapeChar) {
+            levels++;
+        }
+
+        std::string borderChars = subject.substr(begin, levels);
+        size_t end = subject.substr(levels + begin).find(borderChars);
+
+        if (end == std::string::npos) {
+            return "";
+        }
+
+        if (stripEscapeChars) {
+            begin = begin + levels;
+            end = end + begin;
+        } else {
+            end = end + (2 * levels) + begin;
+        }
+
+        std::string escapedString = subject.substr(begin, end - begin);
+        subject = subject.substr(end);
+
+        return escapedString;
+    }
+
+    /**
+     * \brief Strip the enclosing backticks and return the string in the middle.
+     *
+     *        If there are no matching enclosing bacticks, return the whole string.
+     *
+     * \param subject String that needs to be stripped of enclosing backticks
+     *
+     * \return Substring that has been stripped of enclosing backticks
+     */
+    inline std::string StripBackticks(std::string& subject) {
+
+        // Check if first and last chars are backticks
+        if (subject[0] != '`' ||
+            subject[subject.length() - 1] != '`') {
+
+            return subject;
+        }
+
+        std::string escapedString = RetrieveEscaped(subject, 0, true);
+
+        if (escapedString.empty()) {
+            return subject;
+        }
+
+        TrimString(escapedString);
+
+        return escapedString;
+    }
+
+    /**
+     * \brief If the given string is a markdown link, return the string which is being linked
+     *
+     *        If there is no link, return the whole string
+     *
+     * \param subject String which is a markdown link
+     *
+     * \return Substring which is inside the first [] of the markdown link
+     */
+    inline std::string StripMarkdownLink(const std::string& subject) {
+
+        // Check if markdown link
+        if (subject[0] != mdp::MarkdownBeginReference) {
+            return subject;
+        }
+
+        std::string linkedString = RegexCaptureFirst(subject, mdp::MarkdownLinkRegex);
+        TrimString(linkedString);
+
+        return linkedString;
+    }
 }
 
 #endif

data/ext/{snowcrash → drafter/ext/snowcrash}/src/ValuesParser.h

@@ -67,19 +67,7 @@ namespace snowcrash {
             return node;
         }
 
-        static MarkdownNodeIterator processDescription(const MarkdownNodeIterator& node,
-                                                       const MarkdownNodes& siblings,
-                                                       SectionParserData& pd,
-                                                       const ParseResultRef<Values>& out) {
-
-            return node;
-        }
-
-        static bool isDescriptionNode(const MarkdownNodeIterator& node,
-                                      SectionType sectionType) {
-
-            return false;
-        }
+        NO_SECTION_DESCRIPTION(Values)
 
         static SectionType sectionType(const MarkdownNodeIterator& node) {
 

data/ext/drafter/ext/snowcrash/vcbuild.bat

@@ -0,0 +1,139 @@
+@echo off
+
+@rem Attribution Notice
+@rem ------------------
+@rem This file uses parts of Node.js `vcbuild.bat`.
+@rem Please refer to https://github.com/joyent/node.
+
+cd %~dp0
+
+if /i "%1"=="help" goto help
+if /i "%1"=="--help" goto help
+if /i "%1"=="-help" goto help
+if /i "%1"=="/help" goto help
+if /i "%1"=="?" goto help
+if /i "%1"=="-?" goto help
+if /i "%1"=="--?" goto help
+if /i "%1"=="/?" goto help
+
+@rem Process arguments.
+set config=Release
+set target=Build
+set target_arch=ia32
+set noprojgen=
+set nobuild=
+set test=
+
+:next-arg
+if "%1"=="" goto args-done
+if /i "%1"=="debug"         set config=Debug&goto arg-ok
+if /i "%1"=="release"       set config=Release&goto arg-ok
+if /i "%1"=="clean"         set target=Clean&goto arg-ok
+if /i "%1"=="ia32"          set target_arch=ia32&goto arg-ok
+if /i "%1"=="x86"           set target_arch=ia32&goto arg-ok
+if /i "%1"=="x64"           set target_arch=x64&goto arg-ok
+if /i "%1"=="noprojgen"     set noprojgen=1&goto arg-ok
+if /i "%1"=="nobuild"       set nobuild=1&goto arg-ok
+if /i "%1"=="test"          set test=test&goto arg-ok
+if /i "%1"=="MSVC2013"      set GYP_MSVS_VERSION=2013&goto arg-ok
+if /i "%1"=="MSVC2012"      set GYP_MSVS_VERSION=2012&goto arg-ok
+if /i "%1"=="MSVC2010"      set GYP_MSVS_VERSION=2010&goto arg-ok
+if /i "%1"=="MSVC2008"      set GYP_MSVS_VERSION=2008&goto arg-ok
+
+echo Warning: ignoring invalid command line option `%1`.
+
+:arg-ok
+shift
+goto next-arg
+
+:args-done
+if "%config%"=="Debug" set debug_arg=--debug
+
+:project-gen
+@rem Skip project generation if requested.
+if defined noprojgen goto msbuild
+if "%GYP_MSVS_VERSION%"=="" set GYP_MSVS_VERSION=2012
+
+@rem Generate the VS project.
+SETLOCAL
+  if defined VS120COMNTOOLS call "%VS120COMNTOOLS%\VCVarsQueryRegistry.bat"
+  if not defined inttest python configure %debug_arg% --dest-cpu=%target_arch%
+  if errorlevel 1 goto create-msvs-files-failed
+  if not exist build/snowcrash.sln goto create-msvs-files-failed
+  echo Project files generated.
+ENDLOCAL
+
+@rem Skip to the end for now
+@rem goto exit
+
+:msbuild
+@rem Skip project generation if requested.
+if defined nobuild goto exit
+if "%GYP_MSVS_VERSION%"=="2012" goto vc-set-2012
+if "%GYP_MSVS_VERSION%"=="2010" goto vc-set-2010
+if "%GYP_MSVS_VERSION%"=="2008" goto vc-set-2008
+
+@rem Look for Visual Studio 2013
+if not defined VS120COMNTOOLS goto vc-set-2012
+if not exist "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" goto vc-set-2012
+call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat"
+if not defined VCINSTALLDIR goto msbuild-not-found
+goto msbuild-found
+
+:vc-set-2012
+if not defined VS110COMNTOOLS goto vc-set-2010
+if not exist "%VS110COMNTOOLS%\..\..\vc\vcvarsall.bat" goto vc-set-2010
+call "%VS110COMNTOOLS%\..\..\vc\vcvarsall.bat"
+if not defined VCINSTALLDIR goto msbuild-not-found
+goto msbuild-found
+
+:vc-set-2010
+if not defined VS100COMNTOOLS goto vc-set-2008
+if not exist "%VS100COMNTOOLS%\..\..\vc\vcvarsall.bat" goto vc-set-2008
+call "%VS100COMNTOOLS%\..\..\vc\vcvarsall.bat"
+if not defined VCINSTALLDIR goto msbuild-not-found
+goto msbuild-found
+
+:vc-set-2008
+if not defined VS90COMNTOOLS goto msbuild-not-found
+if not exist "%VS90COMNTOOLS%\..\..\vc\vcvarsall.bat" goto msbuild-not-found
+call "%VS90COMNTOOLS%\..\..\vc\vcvarsall.bat"
+if not defined VCINSTALLDIR goto msbuild-not-found
+goto msbuild-found
+
+:msbuild-not-found
+echo Build skipped. To build, this file needs to run from VS cmd prompt.
+goto exit
+
+:msbuild-found
+@rem Build the sln with msbuild.
+@rem Refer to http://msdn.microsoft.com/en-us/library/ms164311.aspx
+echo Building Snow Crash...
+msbuild build/snowcrash.sln /m /clp:NoSummary;NoItemAndPropertyList;Verbosity=normal /nologo /property:Configuration=%config%
+if errorlevel 1 goto exit
+
+:run
+@rem Run tests if requested.
+echo Running tests...
+.\build\%config%\test-libsnowcrash.exe
+
+@rem All Done
+goto exit
+
+:create-msvs-files-failed
+echo Failed to create vc project files. 
+goto exit
+
+:help
+echo vcbuild.bat [debug/release] [test] [clean] [noprojgen] [nobuild] [x86/x64] [inttest] [MSVC2012/MSVC2013]
+echo Examples:
+echo   vcbuild.bat                : builds release build
+echo   vcbuild.bat nobuild        : generate MSVS project files only
+echo   vcbuild.bat debug          : builds debug build
+echo   vcbuild.bat test           : builds debug build and runs tests
+echo   vcbuild.bat inttest        : include integration tests
+echo   vcbuild.bat MSVC2013       : indicate target solution's version, could also define as MSVC2012, MSVC2013
+goto exit
+
+:exit
+goto :EOF