Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes to CParser #51

Merged
merged 3 commits into from
Jul 10, 2018
Merged

Fixes to CParser #51

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e19696
Refactor compound_statement
Jul 9, 2018
f0c8b76
Aggregate expressions can be empty
Jul 9, 2018
1e8dbd8
Support C99 positional array initialisation
Jul 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 46 additions & 41 deletions ward/cparser.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,38 @@ local function build_for_stmt(init, cond, step, body)
return init_node, exit_node
end

local function build_compount_stmt_local_variables(str, pos, declarations)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

compount -> compound

local local_declarations = { }
for _, declaration in ipairs(declarations) do
local name, type, vpos, value = unpack(declaration)
local storage = declaration[5]
if type:is_function() then
local funcdef = storage
funcdef.type = type.result_type
funcdef.arg_types = type.arg_types
funcdef.name = name
funcdef.filename = source_file_name
funcdef.graph = nil
if storage.static then
if not static_functions[name] then
static_functions[name] = funcdef
end
else
if not global_functions[name] then
global_functions[name] = funcdef
end
end
else
if storage.extern then
global_variables[name] = type
else
push(local_declarations, declaration);
end
end
end
return pos, local_declarations
end

local function build_compound_stmt_part(decls, stmts)
local first, last
local head_node = make_node()
Expand Down Expand Up @@ -1060,47 +1092,20 @@ local grammar = pattern {
function (str, pos, start, body, cond, finish)
return pos, { build_do_stmt, start, finish, body, cond }
end),
compound_statement = action(action(pattern "{", function(str, pos)
return pos, pos-1
end) * sp *
aggregate(
aggregate((rule "statement" * sp) ^ 0) *
(aggregate(action(rule "variable_declaration" * sp,
function(str, pos, declarations)
local local_declarations = { }
for _, declaration in ipairs(declarations) do
local name, type, vpos, value = unpack(declaration)
local storage = declaration[5]
if type:is_function() then
local funcdef = storage
funcdef.type = type.result_type
funcdef.arg_types = type.arg_types
funcdef.name = name
funcdef.filename = source_file_name
funcdef.graph = nil
if storage.static then
if not static_functions[name] then
static_functions[name] = funcdef
end
else
if not global_functions[name] then
global_functions[name] = funcdef
end
end
else
if storage.extern then
global_variables[name] = type
else
push(local_declarations, declaration);
end
end
end
return pos, local_declarations
end) ^ 1) *
aggregate((rule "statement" * sp) ^ 0)) ^ 0
) * pattern "}" * position(),
function(str, pos, start, decls_and_stmts, finish)
return pos, { build_compound_stmt, start, finish, decls_and_stmts }
compound_statement =
action(
action(pattern "{", function(str, pos)
return pos, pos-1
end) * sp *
aggregate(
aggregate((rule "statement" * sp) ^ 0) *
(aggregate(action(rule "variable_declaration" * sp,
build_compount_stmt_local_variables) ^ 1) *
aggregate((rule "statement" * sp) ^ 0)) ^ 0
) *
pattern "}" * position(),
function(str, pos, start, decls_and_stmts, finish)
return pos, { build_compound_stmt, start, finish, decls_and_stmts }
end),
-- Warning: The following hack allows ward to parse C99 'for' loops which declare
-- variables in their init section, like in this snippet:
Expand Down