From 9557d0cb5a1b3aa9466ddc504be004b5449ce9f2 Mon Sep 17 00:00:00 2001 From: YanaRG Date: Sat, 3 Nov 2018 15:22:53 +0200 Subject: Added prettifier and control structure collapse. (#19) * Create README.md * Initial commit * Initial commit * Create README.md * Rename homework/81281/c2html.pl to homework/81281/c2html/c2html.pl * Rename homework/81281/test.c to homework/81281/c2html/test.c * Update README.md * Update README.md * Update c2html.pl * Update c2html.pl * Update c2html.pl * Update README.md * Update c2html.pl * Update test.c * Create executeProgram.sh * Update README.md * Update c2html.pl * Initial commit of updated code + prettify C * Rename secret.c to messyCode.c * Update and rename test.c to initialTest.c * Update README.md * Update README.md * Update README.md * Update README.md * Rename executeProgram.sh to c2htmlrun.sh * Update README.md * Update prettify.pl * Update prettify.pl * Update messyCode.c * Fixed some bugs. * Update README.md * Update c2html.pl * Added collapse and fixed matrix representation. * Updated flatten and added predicate for function identification. * Update initialTest.c * Update messyCode.c * Bug fixing, added is_functionAndBody predicate. * Update print.pl * Result after applying prettify and added collapse functions * Can identify structures and collapse them too * Can identify structures and collapse them too * Can identify structures and collapse them too * Can identify structures and collapse them too * Can identify structures and collapse them too * Update messyCode.c * Update README.md * Update prettify.pl * Update README.md * Update prettify.pl * Update messyCode.c * Update messyCode.c * Update page.html * Fix bug typedef * Update page.html * Added choices * Update c2html.pl * Update prettify.pl * Update prettify.pl * Update README.md * Update README.md * Update c2html.pl * Update c2html.pl * Added forgotten do-while structure format * Update messyCode.c * Removing unknown tokens from stream * Rename homework/81281/c2html/page.html to homework/81281/c2html/exampleCodeAndTestPage/page.html * Rename homework/81281/c2html/messyCode.c to homework/81281/c2html/exampleCodeAndTestPage/messyCode.c * Rename homework/81281/c2html/initialTest.c to homework/81281/c2html/exampleCodeAndTestPage/initialTest.c * Update prettify.pl * Can collapse all control structures and fixed comment /**/ * Can collapse all control structures and fixed comment /**/ * Can collapse all control structures and fixed comment /**/ * Can collapse all control structures and fixed comment /**/ * Can collapse all control structures and fixed comment /**/ * Fixed named of predicates * Update messyCode.c * Update page.html * Update README.md * Changed execTAB to "\s\s\s\s" * Changed execTAB to "\s\s\s\s" * Changed execTAB to "\s\s\s\s" * Update page.html * Added new tokens (forgotten operators) and added rules for them * Added new tokens (forgotten operators) and fixed some old predicates * Fixed bug with "else '\n' if (..)" in addNewLines predicate * Fixed regular expression for a string and removed token ttypesPrintF * Added clauses for handling enum and fixed handling of chars * Fixed typos * Added forgotten token to clause * Fixed "case smt :'\n'" where smt is more than one char * Fixed some bugs and divided code in modules * New code module and fixed bugs * Fixed some bugs with tabulation * Divided code in modules --- homework/81281/c2html/c2html.pl | 443 ++++++++++------------------------------ 1 file changed, 112 insertions(+), 331 deletions(-) (limited to 'homework/81281/c2html/c2html.pl') diff --git a/homework/81281/c2html/c2html.pl b/homework/81281/c2html/c2html.pl index 82e8840..9479b96 100644 --- a/homework/81281/c2html/c2html.pl +++ b/homework/81281/c2html/c2html.pl @@ -1,351 +1,132 @@ :- use_module(library(dcg/basics)). :- use_module(library(readutil)). - +:- [tokens, prettify, print, essentials, controlStructures]. :- set_prolog_flag(verbose, silent). :- initialization(main, main). main :- current_prolog_flag(argv, Argv), - Argv = [H|_], - atom_string(H, File), - mainy(File), + Argv = [H1, H2|_], + atom_string(H1, File), + atom_string(H2, Number), + mainy(File, Number), format('You can see the result in the html file.~n'), halt. main :- halt(1). -mainy(File):- +mainy(File, Number):- + open(File, read, RFile), read_stream_to_codes(RFile, CSource), close(RFile), phrase(tokens(Tokens), CSource), -%% write(Tokens), + flattenMine(Tokens, TokenStream), + ((Number == "0", PrettyCode = TokenStream); + (Number == "1", prettify(TokenStream, Raw), + flattenMine(Raw, PrettyCode)); + (Number == "2", prettify(TokenStream, Raw), + identifyControlStructures(Raw, RawF), + flattenMine(RawF, PrettyCode))), open('page.html', write, WFile), - write(WFile," + write(WFile,' - - hello.c - - - -
"),
-    tohtmlfile(WFile,Tokens),
-    close(WFile).
-
-%% Definitions of tokens
-token([tauto, "auto" ]) --> "auto", !.
-token([tbreak, "break" ]) --> "break", !.
-token([tcase, "case" ]) --> "case", !.
-token([tchar, "char" ]) --> "char", !.
-token([tconst, "const" ]) --> "const", !.
-token([tcontinue, "continue" ]) --> "continue", !.
-token([tdefault, "default" ]) --> "default", !.
-token([tdo, "do" ]) --> "do", !.
-token([tdouble, "double" ]) --> "double", !.
-token([telse, "else" ]) --> "else", !.
-token([tenum, "enum" ]) --> "enum", !.
-token([textern, "extern" ]) --> "extern", !.
-token([tfloat, "float" ]) --> "float", !.
-token([tfor, "for" ]) --> "for", !.
-token([tgoto, "goto" ]) --> "goto", !.
-token([tif, "if" ]) --> "if", !.
-token([tint, "int" ]) --> "int", !.
-token([tlong, "long" ]) --> "long", !.
-token([tregister, "register" ]) --> "register", !.
-token([treturn, "return" ]) --> "return", !.
-token([tshort, "short" ]) --> "short", !.
-token([tsigned, "signed" ]) --> "signed", !.
-token([tsizeof, "sizeof" ]) --> "sizeof", !.
-token([tstatic, "static" ]) --> "static", !.
-token([tstruct, "struct" ]) --> "struct", !.
-token([tswitch,  "switch"]) --> "switch", !.
-token([ttypedef, "switch" ]) --> "typedef", !.
-token([tunion, "union" ]) --> "union", !.
-token([tunsigned, "unsigned" ]) --> "unsigned", !.
-token([tvoid, "void" ]) --> "void", !.
-token([tvolatile, "volatile" ]) --> "volatile", !.
-token([twhile, "while" ]) --> "while", !.
-token([tinclude, "#include" ]) --> "#include", !.
-
-token([tcomment1, IA]) --> comment1(I), !,
-    {atom_chars(IA,I)}.
-
-%% Handling windows written files with "\r\n"
-token([[tcomment2, IA], [execNL, '\n']]) --> comment2(I), !,
-    {append(I1, [C1, C2], I),
-    ((char_code('\r', C1), char_code('\n', C2), atom_chars(IA,I1));
-    (\+ char_code('\r', C1), char_code('\n', C2),
-    append(I1, [C1], I2), atom_chars(IA,I2)))}.
-
-token([ttypesPrintF, IA]) --> prFT(I), !,
-    {atom_chars(IA,I)}.
-token([tstring, IA]) --> stringy(I), !,
-    {atom_chars(IA,I)}.
-token([theader, IA]) --> header(I), !,
-    {append(IO, [_], I), append([_], II, IO), atom_chars(IA,II)}.
-token([[tfunction, IA], [tleftParen, "("]]) --> func(I), !,
-    {append(IO, [_], I), IO \= [], atom_chars(IA, IO)}.
-
-token([tmultiply, "*"]) --> "*", !.
-token([tdivide, "/"]) --> "/", !.
-token([tmod, "%"]) --> "%", !.
-token([tadd, "+"]) --> "+", !.
-token([tsubtract, "-"]) --> "-", !.
-token([tless, "<"]) --> "<", !.
-token([tlessEqual, "<="]) --> "<=", !.
-token([tgreater, ">"]) --> ">", !.
-token([tgreaterEqual,">=" ]) --> ">=", !.
-token([tequal, "=="]) --> "==", !.
-token([tnotequal,"!=" ]) --> "!=", !.
-token([tnot, "!"]) --> "!", !.
-token([tassign,"="]) --> "=", !.
-token([tlogicalAnd, "&&"]) --> "&&", !.
-token([tlogicalOr, "||"]) --> "||", !.
-token([tbitwiseAnd, "&"]) --> "&", !.
-token([tbitwiseOr, "|"]) --> "|", !.
-
-token([tspace , " "]) --> "\s", !.
-token([ttab , "\t"]) --> "\t", !.
-token([execTAB , "\\t"]) --> "\\t", !.
-token([execNL, "\n"]) --> ( "\n"; "\r\n"), !.
-token([tnl, "\\n"]) --> "\\n", !.
-
-token([tleftParen,"("]) --> "(", !.
-token([trightParen, ")"]) --> ")", !.
-token([tleftBrace, "{"]) --> "{", !.
-token([trightBrace, "}"]) --> "}", !.
-token([tleftSqParen, "["]) --> "[", !.
-token([trightSqParen, "]" ]) --> "]", !.
-token([tsemicolon, ";"]) --> ";", !.
-token([ttwodots, ":"]) --> ":", !.
-token([tquestion, "?"]) --> "?", !.
-
-token([tcomma, "," ]) --> ",", !.
-token([tquot, "\'"]) --> "\'", !.
-token([tdoubleQuot, "\""]) --> "\"", !.
-token([tdot, "."]) --> ".", !.
-
-token([tidentifier, IA]) -->  identifier(I), !,
-    {atom_chars(IA,I)}.
-token([tnumber, I]) --> number(I), !.
-
-token([tunknown, IA]) --> allThatIsNotAToken(I), !,
-    {I \= [], atom_chars(IA, I)}.
-
-
-%% Main predicate
-tokens([Token | Tail]) --> token(Token), !, tokens(Tail).
-tokens([]) --> !, [], !.
-
-
-%% Helper predicates
-identifier([C|Cs]) --> [C], {char_type(C, csymf)}, !,
-    identifierHelper(Cs).
-
-identifierHelper([C|Cs]) --> [C], {char_type(C, csym)}, !,
-    identifierHelper(Cs).
-identifierHelper([C]) --> [C], {char_type(C, csym), \+ char_code('_', C)}, !.
-identifierHelper([]) --> [], !.
-
-func([C|Cs]) --> [C], {char_type(C, csymf)}, !,
-    funkHelper(Cs).
-
-funkHelper([C|Cs]) --> [C], {char_type(C, csym)}, !,
-    funkHelper(Cs).
-funkHelper([C]) --> [C], {char_code("(", C)}, !.
-
-stringy([C|Cs]) --> [C], {char_code('\"', C)}, !,
-    stringyHelper(Cs).
-
-stringyHelper([C|Cs]) --> [C], {char_type(C, csymf); char_code('.', C)},
-    stringyHelper(Cs).
-stringyHelper([C]) --> [C], {char_code('\"', C)}.
-
-header([C|Cs]) --> [C], {char_code('<', C)}, !,
-    hederHelper(Cs).
-
-hederHelper([C|Cs]) --> [C],
-    {char_type(C, csymf); char_code('.', C); char_code('/', C); char_code('+', C)},
-    hederHelper(Cs).
-hederHelper([C]) --> [C], {char_code('>', C)}.
-
-prFT([C|Cs]) --> [C], {char_code('%', C)}, !,
-    pr(Cs).
-
-pr([C]) --> [C], {char_type(C, csym)}.
-
-comment1([C1,C2|Cs]) --> [C1,C2], {char_code('/', C1), char_code('*', C2)}, !,
-    anything(Cs),
-    {append(_,[C3,C4],Cs), char_code('*', C3), char_code('/', C4)}.
-
-comment2([C1,C2|Cs]) --> [C1,C2], {char_code('/', C1), char_code('/', C2)}, !,
-    anytingButNL(Cs).
-
-anything([C|Cs]) --> [C], anything(Cs).
-anything([]) --> [].
-
-allThatIsNotAToken([C|Cs]) --> [C|Cs], \+ tokens(C), \+ tokens([C|Cs]),
-    allThatIsNotAToken(Cs).
-allThatIsNotAToken([]) --> [].
 
-anytingButNL([C|Cs]) --> [C],
-    {\+ char_code('\r', C), \+ char_code('\n', C)}, anytingButNL(Cs).
-anytingButNL([C1,C2|_]) --> [C1,C2],
-    {(char_code('\r', C1),  char_code('\n', C2));
-    (\+ char_code('\r', C1),  char_code('\n', C2))}.
-
-
-%% Definitions of lists of different types of tokens
-is_keyWord([H,_]):- member(H, [tauto, tbreak, tcase, tchar, tconst, tcontinue,
-    tdefault, tdo, tdouble, telse, tenum, textern, tfloat, tfor, tgoto, tif,
-    tint, tlong, tregister, treturn, tshort, tsigned, tsizeof, tstatic, tstruct,
-    tswitch, ttypedef, tunion, tunsigned, twhile, tvoid, tvolatile, tinclude]).
-
-is_operator([H,_]):- member(H, [tmultiply, tdivide, tmod, tadd, tsubtract, tless,
-    tlessEqual, tgreater, tgreaterEqual, tequal, tnotequal, tnot, tassign, tlogicalOr,
-    tlogicalAnd, tbitwiseOr, tbitwiseAnd]).
-
-is_parenth([H,_]):- member(H, [tleftParen, trightParen, tleftBrace, trightBrace,
-    tleftSqParen, trightSqParen, tsemicolon, ttwodots]).
-
-is_quotation([H,_]):- member(H, [tquot, tdoubleQuot, tcomma, tdot, tquestion]).
-
-is_unknown([H,_]):- member(H, [tunknown]).
-
-is_number([H,_]):- member(H, [tnumber, ttypesPrintF]).
-
-is_function([[H,_],_]):- member(H, [tfunction]).
-
-is_identifier([H,_]):- member(H, [tidentifier, tnl, ttab]).
-
-is_blank([H,_]):- member(H, [execTAB, tspace, execNL]).
-
-is_comment1([H,_]):-member(H, [tcomment1]).
-
-is_comment2([[H,_],_]):-member(H, [tcomment2]).
-
-is_string([H,_]):-  member(H, [tstring]).
-
-is_header([H,_]):- member(H, [theader]).
-
-
-%% Writing to html file the stream of tokens
-tohtmlfile(Stream, []):- !, write(Stream, '
'), !. - -tohtmlfile(Stream, [H|T]) :- is_identifier(H), H = [_,Lexem], - write(Stream, ''), - write(Stream, Lexem), - write(Stream,''), - !, - tohtmlfile(Stream, T). - -tohtmlfile(Stream, [H|T]) :- is_string(H), H = [_,Lexem], - write(Stream, ''), - write(Stream, Lexem), - write(Stream,''), - !, - tohtmlfile(Stream, T). - -tohtmlfile(Stream, [H|T]) :- is_function(H), H = [[_, Lexem1],[_,Lexem2]], - write(Stream, ''), - write(Stream, Lexem1), - write(Stream,''), - write(Stream, ''), - write(Stream, Lexem2), - write(Stream,''), - !, - tohtmlfile(Stream, T). - -tohtmlfile(Stream, [H|T]) :- is_header(H), H = [_,Lexem], - write(Stream, '<'), - write(Stream, Lexem), - write(Stream,'>'), - !, - tohtmlfile(Stream, T). - -tohtmlfile(Stream, [H|T]) :- is_keyWord(H), H = [_,Lexem], - write(Stream, ''), - write(Stream, Lexem), - write(Stream,''), - !, - tohtmlfile(Stream, T). - -tohtmlfile(Stream, [H|T]) :- is_number(H), H = [_,Lexem], - write(Stream, ''), - write(Stream, Lexem), - write(Stream,''), - !, - tohtmlfile(Stream, T). - -tohtmlfile(Stream, [H|T]) :- is_operator(H), H = [_,Lexem], - write(Stream, ''), - write(Stream, Lexem), - write(Stream,''), - !, - tohtmlfile(Stream, T). - -tohtmlfile(Stream, [H|T]) :- is_parenth(H), H = [_,Lexem], - write(Stream, ''), - write(Stream, Lexem), - write(Stream,''), - !, - tohtmlfile(Stream, T). - -tohtmlfile(Stream, [H|T]) :- (is_quotation(H); is_unknown(H)), H = [_,Lexem], - write(Stream, ''), - write(Stream, Lexem), - write(Stream,''), - !, - tohtmlfile(Stream, T). - -tohtmlfile(Stream, [H|T]) :- is_comment1(H), H = [_,Lexem], - write(Stream, ''), - write(Stream, Lexem), - write(Stream,''), - !, - tohtmlfile(Stream, T). - -tohtmlfile(Stream, [H|T]) :- is_comment2(H), H = [[_, Lexem1],[_,Lexem2]], - write(Stream, ''), - write(Stream, Lexem1), - write(Stream,''), - write(Stream, Lexem2), - !, - tohtmlfile(Stream, T). - -tohtmlfile(Stream, [H|T]) :- is_blank(H), H = [_,Lexem], - write(Stream, Lexem), - !, - tohtmlfile(Stream, T). + + hello.c + + + + + +
'),
+    tohtmlfile(WFile, PrettyCode),
+    write(WFile, ' 
+                        
+ + + '), + close(WFile). -- cgit v1.3.1-26-gb76a