summaryrefslogtreecommitdiff
path: root/src/scanners.c
diff options
context:
space:
mode:
authorNick Wellnhofer <wellnhofer@aevum.de>2015-06-07 16:52:44 +0200
committerNick Wellnhofer <wellnhofer@aevum.de>2015-06-07 21:42:15 +0200
commit7382fd5eba48107a8190bd2d6232cc3b6e20d8fc (patch)
treeb0d3c9f7b9a2f2eb94c0806c32e9d77f4ba59149 /src/scanners.c
parentd49d3fd7bab4a8734e5f22318e3fb538bfe20dbb (diff)
Convert code base to strbuf_t
There are probably a couple of places I missed. But this will only be a problem if we use a 64-bit bufsize_t at some point. Then, we'll get warnings from -Wshorten-64-to-32.
Diffstat (limited to 'src/scanners.c')
-rw-r--r--src/scanners.c84
1 files changed, 42 insertions, 42 deletions
diff --git a/src/scanners.c b/src/scanners.c
index 7f9ed2e..3f4ddac 100644
--- a/src/scanners.c
+++ b/src/scanners.c
@@ -1,11 +1,11 @@
-/* Generated by re2c 0.13.6 */
+/* Generated by re2c 0.13.5 */
#include <stdlib.h>
#include "chunk.h"
#include "scanners.h"
-int _scan_at(int (*scanner)(const unsigned char *), cmark_chunk *c, int offset)
+bufsize_t _scan_at(bufsize_t (*scanner)(const unsigned char *), cmark_chunk *c, bufsize_t offset)
{
- int res;
+ bufsize_t res;
unsigned char *ptr = (unsigned char *)c->data;
unsigned char lim = ptr[c->len];
@@ -19,7 +19,7 @@ int _scan_at(int (*scanner)(const unsigned char *), cmark_chunk *c, int offset)
// Try to match a scheme including colon.
-int _scan_scheme(const unsigned char *p)
+bufsize_t _scan_scheme(const unsigned char *p)
{
const unsigned char *marker = NULL;
const unsigned char *start = p;
@@ -578,7 +578,7 @@ yy34:
if (yych != ':') goto yy31;
yy35:
++p;
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
yy37:
yych = *++p;
if (yych == 'E') goto yy38;
@@ -2919,7 +2919,7 @@ yy484:
}
// Try to match URI autolink after first <, returning number of chars matched.
-int _scan_autolink_uri(const unsigned char *p)
+bufsize_t _scan_autolink_uri(const unsigned char *p)
{
const unsigned char *marker = NULL;
const unsigned char *start = p;
@@ -3517,7 +3517,7 @@ yy520:
}
if (yych <= '=') goto yy516;
++p;
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
yy524:
yych = *++p;
if (yych == 'E') goto yy525;
@@ -5858,7 +5858,7 @@ yy971:
}
// Try to match email autolink after first <, returning num of chars matched.
-int _scan_autolink_email(const unsigned char *p)
+bufsize_t _scan_autolink_email(const unsigned char *p)
{
const unsigned char *marker = NULL;
const unsigned char *start = p;
@@ -6060,7 +6060,7 @@ yy984:
}
yy985:
++p;
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
yy987:
++p;
yych = *p;
@@ -10803,7 +10803,7 @@ yy1230:
}
// Try to match an HTML tag after first <, returning num of chars matched.
-int _scan_html_tag(const unsigned char *p)
+bufsize_t _scan_html_tag(const unsigned char *p)
{
const unsigned char *marker = NULL;
const unsigned char *start = p;
@@ -10964,7 +10964,7 @@ yy1242:
if (yych != '>') goto yy1239;
yy1243:
++p;
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
yy1245:
yych = *++p;
if (yych == 'C') goto yy1260;
@@ -11455,7 +11455,7 @@ yy1297:
// Try to match an HTML block tag including first <,
// returning num of chars matched.
-int _scan_html_block_tag(const unsigned char *p)
+bufsize_t _scan_html_block_tag(const unsigned char *p)
{
const unsigned char *marker = NULL;
const unsigned char *start = p;
@@ -11513,7 +11513,7 @@ yy1303:
goto yy1301;
yy1304:
++p;
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
yy1306:
yych = *++p;
if (yych <= '/') {
@@ -12022,7 +12022,7 @@ yy1343:
}
yy1344:
++p;
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
yy1346:
yych = *++p;
if (yych <= 'R') {
@@ -12639,7 +12639,7 @@ yy1466:
}
yy1467:
++p;
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
yy1469:
yych = *++p;
if (yych <= 'R') {
@@ -13243,7 +13243,7 @@ yy1585:
// This may optionally be contained in <..>; otherwise
// whitespace and unbalanced right parentheses aren't allowed.
// Newlines aren't ever allowed.
-int _scan_link_url(const unsigned char *p)
+bufsize_t _scan_link_url(const unsigned char *p)
{
const unsigned char *marker = NULL;
const unsigned char *start = p;
@@ -13308,7 +13308,7 @@ int _scan_link_url(const unsigned char *p)
}
}
yy1588:
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
yy1589:
yyaccept = 0;
marker = ++p;
@@ -13402,7 +13402,7 @@ yy1599:
yy1600:
p = marker;
if (yyaccept <= 1) {
- if (yyaccept == 0) {
+ if (yyaccept <= 0) {
goto yy1588;
} else {
goto yy1595;
@@ -13490,7 +13490,7 @@ yy1607:
if (yych <= ' ') goto yy1608;
if (yych != ')') goto yy1603;
yy1608:
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
yy1609:
++p;
yych = *p;
@@ -13732,7 +13732,7 @@ yy1623:
// Try to match a link title (in single quotes, in double quotes, or
// in parentheses), returning number of chars matched. Allow one
// level of internal nesting (quotes within quotes).
-int _scan_link_title(const unsigned char *p)
+bufsize_t _scan_link_title(const unsigned char *p)
{
const unsigned char *marker = NULL;
const unsigned char *start = p;
@@ -13818,13 +13818,13 @@ yy1632:
yy1633:
p = marker;
if (yyaccept <= 1) {
- if (yyaccept == 0) {
+ if (yyaccept <= 0) {
goto yy1626;
} else {
goto yy1637;
}
} else {
- if (yyaccept == 2) {
+ if (yyaccept <= 2) {
goto yy1644;
} else {
goto yy1651;
@@ -13842,7 +13842,7 @@ yy1634:
yy1636:
++p;
yy1637:
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
yy1638:
yyaccept = 1;
marker = ++p;
@@ -13874,7 +13874,7 @@ yy1641:
yy1643:
++p;
yy1644:
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
yy1645:
yyaccept = 2;
marker = ++p;
@@ -13906,7 +13906,7 @@ yy1648:
yy1650:
++p;
yy1651:
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
yy1652:
yyaccept = 3;
marker = ++p;
@@ -13922,7 +13922,7 @@ yy1652:
}
// Match space characters, including newlines.
-int _scan_spacechars(const unsigned char *p)
+bufsize_t _scan_spacechars(const unsigned char *p)
{
const unsigned char *start = p; \
@@ -13973,7 +13973,7 @@ int _scan_spacechars(const unsigned char *p)
goto yy1659;
}
yy1655:
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
yy1656:
yych = *++p;
goto yy1658;
@@ -13993,7 +13993,7 @@ yy1659:
}
// Match ATX header start.
-int _scan_atx_header_start(const unsigned char *p)
+bufsize_t _scan_atx_header_start(const unsigned char *p)
{
const unsigned char *marker = NULL;
const unsigned char *start = p;
@@ -14059,7 +14059,7 @@ yy1665:
yy1666:
++p;
yy1667:
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
yy1668:
++p;
yych = *p;
@@ -14128,7 +14128,7 @@ yy1672:
// Match setext header line. Return 1 for level-1 header,
// 2 for level-2, 0 for no match.
-int _scan_setext_header_line(const unsigned char *p)
+bufsize_t _scan_setext_header_line(const unsigned char *p)
{
const unsigned char *marker = NULL;
@@ -14269,7 +14269,7 @@ yy1693:
// Scan a horizontal rule line: "...three or more hyphens, asterisks,
// or underscores on a line by themselves. If you wish, you may use
// spaces between the hyphens or asterisks."
-int _scan_hrule(const unsigned char *p)
+bufsize_t _scan_hrule(const unsigned char *p)
{
const unsigned char *marker = NULL;
const unsigned char *start = p;
@@ -14384,7 +14384,7 @@ yy1709:
if (yych != '\r') goto yy1704;
yy1711:
++p;
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
yy1713:
++p;
yych = *p;
@@ -14422,7 +14422,7 @@ yy1719:
}
yy1721:
++p;
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
yy1723:
++p;
yych = *p;
@@ -14460,13 +14460,13 @@ yy1729:
}
yy1731:
++p;
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
}
}
// Scan an opening code fence.
-int _scan_open_code_fence(const unsigned char *p)
+bufsize_t _scan_open_code_fence(const unsigned char *p)
{
const unsigned char *marker = NULL;
const unsigned char *start = p;
@@ -14557,7 +14557,7 @@ yy1743:
yy1745:
++p;
p = marker;
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
yy1747:
yych = *++p;
if (yybm[0+yych] & 64) {
@@ -14585,13 +14585,13 @@ yy1750:
yy1752:
++p;
p = marker;
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
}
}
// Scan a closing code fence with length at least len.
-int _scan_close_code_fence(const unsigned char *p)
+bufsize_t _scan_close_code_fence(const unsigned char *p)
{
const unsigned char *marker = NULL;
const unsigned char *start = p;
@@ -14687,7 +14687,7 @@ yy1764:
yy1766:
++p;
p = marker;
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
yy1768:
yych = *++p;
if (yybm[0+yych] & 128) {
@@ -14725,14 +14725,14 @@ yy1771:
yy1773:
++p;
p = marker;
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
}
}
// Scans an entity.
// Returns number of chars matched.
-int _scan_entity(const unsigned char *p)
+bufsize_t _scan_entity(const unsigned char *p)
{
const unsigned char *marker = NULL;
const unsigned char *start = p;
@@ -14799,7 +14799,7 @@ yy1783:
}
yy1784:
++p;
- { return (p - start); }
+ { return (bufsize_t)(p - start); }
yy1786:
yych = *++p;
if (yych <= ';') {