Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@suconghou
suconghou committed Jun 5, 2023
1 parent 8a07bca commit f6a9554
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 146 deletions.
25 changes: 12 additions & 13 deletions c++/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@ class Line
int
parse_item_trim_space(char *item_value, char_is_match cond, bool strip_square)
{
unsigned char x, y, z;
while (index < len)
{
const unsigned char x = str[index];
x = str[index];
if (x == ' ' || (strip_square && x == '['))
{
index++;
Expand All @@ -91,21 +92,20 @@ class Line
}
int found_start = -1;
int found_end = -1;
int i = index;
while (i < len)
while (index < len)
{
const unsigned char x = str[i];
i++;
const unsigned char y = i < len ? str[i] : 0;
const unsigned char z = i >= 2 ? str[i - 2] : 0;
x = str[index];
index++;
y = index < len ? str[index] : 0;
z = index >= 2 ? str[index - 2] : 0;
if (cond(x, y, z))
{
found_end = i - 1;
found_end = index - 1;
if (found_start < 0)
{
found_start = found_end;
}
if (i < len)
if (index < len)
{
continue;
}
Expand All @@ -118,19 +118,18 @@ class Line
const int v_len = found_end - found_start + 1;
memcpy(item_value, str + found_start, v_len);
item_value[v_len] = '\0';
while (i < len)
while (index < len)
{
const unsigned char x = str[i];
x = str[index];
if (x == ' ' || (strip_square && x == ']'))
{
i++;
index++;
}
else
{
break;
}
}
index = i;
return found_start;
}
return found_start;
Expand Down
12 changes: 7 additions & 5 deletions c/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,11 @@ int digital_or_none_end(unsigned char x, unsigned char y, unsigned char z)
// offset 字符串坐标
int parse_item_trim_space(const char *s, int *offset, int len, char *item_value, char_is_match cond, int strip_square)
{
unsigned char x, y, z;
int i = *offset;
while (i < len)
{
unsigned char x = s[i];
x = s[i];
if (x == ' ' || (strip_square && x == '['))
{
i++;
Expand All @@ -75,12 +76,13 @@ int parse_item_trim_space(const char *s, int *offset, int len, char *item_value,
*offset = i;
int found_start = -1;
int found_end = -1;

while (i < len)
{
const unsigned char x = s[i];
x = s[i];
i++;
const unsigned char y = i < len ? s[i] : 0;
const unsigned char z = i >= 2 ? s[i - 2] : 0;
y = i < len ? s[i] : 0;
z = i >= 2 ? s[i - 2] : 0;
if (cond(x, y, z))
{
found_end = i - 1;
Expand All @@ -103,7 +105,7 @@ int parse_item_trim_space(const char *s, int *offset, int len, char *item_value,
item_value[v_len] = '\0';
while (i < len)
{
const unsigned char x = s[i];
x = s[i];
if (x == ' ' || (strip_square && x == ']'))
{
i++;
Expand Down
154 changes: 26 additions & 128 deletions main.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,12 @@ func substr(s: string, first: int, last: int): string =

# 根据条件解析，并去除前置后置x字符
proc parse_item_trimx(this: var Line, left: set[char], right: set[char], cond: proc): string =
var i = this.index;
while i < this.str.len:
if this.str[i] in left:
i+=1
while this.index < this.str.len:
if this.str[this.index] in left:
this.index+=1
else:
break
this.index = i
var item_value: string;
var i = this.index;
var found_start = -1;
var found_end = -1;
while i < this.str.len:
Expand All @@ -49,46 +47,37 @@ proc parse_item_trimx(this: var Line, left: set[char], right: set[char], cond: p
if found_start < 0:
# 完全没有匹配到
raise newException(ValueError, "匹配失败:"&this.str)
# cond成立时,则包含当前字符x，否则不包含，截取的字符最少1字节
item_value = this.str.substr(found_start, found_end)
while i < this.str.len:
if this.str[i] in right:
i+=1
else:
break
this.index = i;
return item_value

# 防止前置字符去除时，直接continue完所有
if found_start < 0:
raise newException(ValueError, "匹配失败:"&this.str)
return item_value
# cond成立时,则包含当前字符x，否则不包含，截取的字符最少1字节
return this.str.substr(found_start, found_end)
raise newException(ValueError, "匹配失败:"&this.str)

proc parse_item_quote_string(this: var Line): string =
var i = this.index
var quote_start = -1
var item_value: string;
while i < this.str.len:
while this.index < this.str.len:
if quote_start < 0:
if this.str[i] == '\32':
i+=1
if this.str[this.index] == '\32':
this.index+=1
continue
elif this.str[i] == '\34':
quote_start = i
i+=1
elif this.str[this.index] == '\34':
quote_start = this.index
this.index+=1
continue
else:
break
if this.str[i] == '\34':
item_value = this.str.substr(quote_start+1, i-1)
i+=1
break
if this.str[this.index] == '\34':
let end_s = this.index - 1;
this.index += 1
# 不包含quote_start的位置，也不包含最后i的位置
return this.str.substr(quote_start+1, end_s)
else:
i+=1
this.index = i
if quote_start < 0:
raise newException(ValueError, "匹配失败:"&this.str)
return item_value
this.index+=1
raise newException(ValueError, "匹配失败:"&this.str)



Expand Down Expand Up @@ -122,13 +111,12 @@ proc parse_remote_addr(this: var Line): string =

# 去除可能存在的-,非空格
proc parse_remote_user(this: var Line): string =
var i = this.index
while i < this.str.len:
if this.str[i] == '\45':
i+=1
else:
break;
this.index = i
while this.index < this.str.len:
case this.str[this.index]:
of '\45':
this.index+=1
else:
break;
return this.parse_item_trimx(blank, blank, not_space)

# 匹配到],并且下一个是空格
Expand Down Expand Up @@ -358,93 +346,3 @@ except CatchableError:
quit(1)



runnableExamples:

proc test1(line: string) =
var l = Line(str: line)
let remote_addr = l.parse_remote_addr()
# echo "remote_addr:["&remote_addr&"]"
# echo l.str
let remote_user = l.parse_remote_user()
# echo "remote_user:["&remote_user&"]"
# echo l.str
let time_local = l.parse_time_local()
# echo "time_local:["&time_local&"]"
# echo l.str
let request_line = l.parse_request_line()
# echo request_line
# echo "request_line:["&request_line&"]"
# echo l.str
let status_code = l.parse_status_code()
# echo "status_code:["&status_code&"]"
# echo l.str

let body_bytes_sent = l.parse_body_bytes_sent()
# echo body_bytes_sent
# echo "body_bytes_sent:["&body_bytes_sent&"]"
# echo l.str

let http_referer = l.parse_http_referer()
# echo "http_referer:["&http_referer&"]"
# echo l.str

let http_user_agent = l.parse_http_user_agent()
# echo http_user_agent
# echo "http_user_agent:["&http_user_agent&"]"
# echo l.str

let http_x_forwarded_for = l.parse_http_x_forwarded_for()
# echo "http_x_forwarded_for:["&http_x_forwarded_for&"]"
# echo l.str


# let host = l.parse_host()
# echo "host:["&host&"]"
# echo l.str

# let request_length = l.parse_request_length()
# echo request_length
# echo "request_length:["&request_length&"]"
# echo l.str

# let bytes_sent = l.parse_bytes_sent()
# echo "bytes_sent:["&bytes_sent&"]"
# echo l.str

# let upstream_addr = l.parse_upstream_addr()
# echo "upstream_addr:["&upstream_addr&"]"
# echo l.str

# let upstream_status = l.parse_upstream_status()
# echo "upstream_status:["&upstream_status&"]"
# echo l.str

# let request_time = l.parse_request_time()
# echo "request_time:["&request_time&"]"
# echo l.str


# let upstream_response_time = l.parse_upstream_response_time()
# echo "["&upstream_response_time&"]"
# echo l.str



# let upstream_connect_time = l.parse_upstream_connect_time()
# echo "[upstream_connect_time:"&upstream_connect_time&"]"
# echo l.str


# let upstream_header_time = l.parse_upstream_header_time()
# echo "[upstream_header_time:"&upstream_header_time&"]"
# echo l.str

for line in stdin.lines:
try:
test1(line)
except:
raise
stderr.writeLine(getCurrentExceptionMsg())
stderr.writeLine(line)

0 comments on commit f6a9554

Please sign in to comment.