Plugins-Commits July 2012

plugins-commits@lists.geany.org

1 participants
220 discussions

[geany/geany-plugins] 8f299e: Another small update of German translation
by Frank Lanitz 09 Jul '12

09 Jul '12

Branch: refs/heads/1.22_release Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 09 Jul 2012 14:06:54 Commit: 8f299ec07da482a2517e3c1d9b2aedc6580a21b5 https://github.com/geany/geany-plugins/commit/8f299ec07da482a2517e3c1d9b2ae… Log Message: ----------- Another small update of German translation Modified Paths: -------------- po/de.po Modified: po/de.po 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -2405,7 +2405,7 @@ msgstr "Symbol für LaTeX-Assistent in die Werkzeugliste einfügen" #: ../geanylatex/src/geanylatex.c:306 msgid "Lower selection when formating smallcaps (\\textsc{})" -msgstr "Auswahl niedriger machen beim Formatireen von kleinen Kapitälchen (\\textsc{})" +msgstr "Auswahl im Kleinbuchstaben umwandeln zur Benutzung von kleinen Kapitälchen (\\textsc{})" #: ../geanylatex/src/geanylatex.c:310 msgid "Don't care about this inside plugin" @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] bbcd76: Update of German translation
by Frank Lanitz 09 Jul '12

09 Jul '12

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 09 Jul 2012 13:06:44 Commit: bbcd766e8e306031884c364cf926937e9584440d https://github.com/geany/geany-plugins/commit/bbcd766e8e306031884c364cf9269… Log Message: ----------- Update of German translation Modified Paths: -------------- po/de.po Modified: po/de.po 1442 files changed, 603 insertions(+), 839 deletions(-) =================================================================== No diff available, check online @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] bbcd76: Update of German translation
by Frank Lanitz 09 Jul '12

09 Jul '12

Branch: refs/heads/1.22_release Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 09 Jul 2012 13:06:44 Commit: bbcd766e8e306031884c364cf926937e9584440d https://github.com/geany/geany-plugins/commit/bbcd766e8e306031884c364cf9269… Log Message: ----------- Update of German translation Modified Paths: -------------- po/de.po Modified: po/de.po 1442 files changed, 603 insertions(+), 839 deletions(-) =================================================================== No diff available, check online @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] e05f1d: GeniusPaste: Fix misuse of g_strlcat() and simplify the code
by Matthew Brush 08 Jul '12

08 Jul '12

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 08 Jul 2012 21:28:23 Commit: e05f1d6624db0deae08d4300630338910ba3c47e https://github.com/geany/geany-plugins/commit/e05f1d6624db0deae08d430063033… Log Message: ----------- GeniusPaste: Fix misuse of g_strlcat() and simplify the code Modified Paths: -------------- geniuspaste/src/geniuspaste.c Modified: geniuspaste/src/geniuspaste.c 6 files changed, 2 insertions(+), 4 deletions(-) =================================================================== @@ -377,10 +377,8 @@ static void paste(GeanyDocument * doc, const gchar * website) * e.g. sprunge.us/xxxx?c */ gchar *ft_tmp = g_ascii_strdown(f_type, -1); - p_url[strlen(p_url) - 1] = '\0'; - temp_body = g_strdup_printf("?%s", ft_tmp); - g_strlcat(p_url + 1, temp_body, -1); - p_url = g_strstrip(p_url); + temp_body = g_strstrip(p_url); + p_url = g_strdup_printf("%s?%s", temp_body, ft_tmp); g_free(temp_body); g_free(ft_tmp); } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] e05f1d: GeniusPaste: Fix misuse of g_strlcat() and simplify the code
by Matthew Brush 08 Jul '12

08 Jul '12

Branch: refs/heads/1.22_release Author: Matthew Brush <matt(a)geany.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 08 Jul 2012 21:28:23 Commit: e05f1d6624db0deae08d4300630338910ba3c47e https://github.com/geany/geany-plugins/commit/e05f1d6624db0deae08d430063033… Log Message: ----------- GeniusPaste: Fix misuse of g_strlcat() and simplify the code Modified Paths: -------------- geniuspaste/src/geniuspaste.c Modified: geniuspaste/src/geniuspaste.c 6 files changed, 2 insertions(+), 4 deletions(-) =================================================================== @@ -377,10 +377,8 @@ static void paste(GeanyDocument * doc, const gchar * website) * e.g. sprunge.us/xxxx?c */ gchar *ft_tmp = g_ascii_strdown(f_type, -1); - p_url[strlen(p_url) - 1] = '\0'; - temp_body = g_strdup_printf("?%s", ft_tmp); - g_strlcat(p_url + 1, temp_body, -1); - p_url = g_strstrip(p_url); + temp_body = g_strstrip(p_url); + p_url = g_strdup_printf("%s?%s", temp_body, ft_tmp); g_free(temp_body); g_free(ft_tmp); } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] 5d48b6: GeanyNumberedBookmarks: Remove superfluous semicolons
by Colomban Wendling 08 Jul '12

08 Jul '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 08 Jul 2012 21:15:17 Commit: 5d48b6c2ede5ebfe6fd7feb783a61290fe432077 https://github.com/geany/geany-plugins/commit/5d48b6c2ede5ebfe6fd7feb783a61… Log Message: ----------- GeanyNumberedBookmarks: Remove superfluous semicolons Modified Paths: -------------- geanynumberedbookmarks/src/geanynumberedbookmarks.c Modified: geanynumberedbookmarks/src/geanynumberedbookmarks.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -56,7 +56,7 @@ PLUGIN_VERSION_CHECK(147) PLUGIN_SET_INFO("Numbered Bookmarks",_("Numbered Bookmarks for Geany"), - "1.0","William Fraser <william.fraser(a)virgin.net>"); + "1.0","William Fraser <william.fraser(a)virgin.net>") /* Plugin user alterable settings */ static gboolean bCenterWhenGotoBookmark=TRUE; @@ -1369,7 +1369,7 @@ static void SetBookMark(gint iBookMark) { gint iNewLine,iOldLine,iPosInLine,m; ScintillaObject* sci=document_get_current()->editor->sci; - FileData *fd=GetFileData(document_get_current()->file_name);; + FileData *fd=GetFileData(document_get_current()->file_name); GtkWidget *dialog; /* see if already such a bookmark present */ @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] 5d48b6: GeanyNumberedBookmarks: Remove superfluous semicolons
by Colomban Wendling 08 Jul '12

08 Jul '12

Branch: refs/heads/1.22_release Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 08 Jul 2012 21:15:17 Commit: 5d48b6c2ede5ebfe6fd7feb783a61290fe432077 https://github.com/geany/geany-plugins/commit/5d48b6c2ede5ebfe6fd7feb783a61… Log Message: ----------- GeanyNumberedBookmarks: Remove superfluous semicolons Modified Paths: -------------- geanynumberedbookmarks/src/geanynumberedbookmarks.c Modified: geanynumberedbookmarks/src/geanynumberedbookmarks.c 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -56,7 +56,7 @@ PLUGIN_VERSION_CHECK(147) PLUGIN_SET_INFO("Numbered Bookmarks",_("Numbered Bookmarks for Geany"), - "1.0","William Fraser <william.fraser(a)virgin.net>"); + "1.0","William Fraser <william.fraser(a)virgin.net>") /* Plugin user alterable settings */ static gboolean bCenterWhenGotoBookmark=TRUE; @@ -1369,7 +1369,7 @@ static void SetBookMark(gint iBookMark) { gint iNewLine,iOldLine,iPosInLine,m; ScintillaObject* sci=document_get_current()->editor->sci; - FileData *fd=GetFileData(document_get_current()->file_name);; + FileData *fd=GetFileData(document_get_current()->file_name); GtkWidget *dialog; /* see if already such a bookmark present */ @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] ce1094: PrettyPrinter: Don't mix declarations and code
by Colomban Wendling 08 Jul '12

08 Jul '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 08 Jul 2012 21:14:20 Commit: ce109470bc165581f85487fe44c543b2df76b974 https://github.com/geany/geany-plugins/commit/ce109470bc165581f85487fe44c54… Log Message: ----------- PrettyPrinter: Don't mix declarations and code Modified Paths: -------------- pretty-printer/src/ConfigUI.c pretty-printer/src/PluginEntry.c pretty-printer/src/PrettyPrinter.c Modified: pretty-printer/src/ConfigUI.c 39 files changed, 26 insertions(+), 13 deletions(-) =================================================================== @@ -52,25 +52,36 @@ /* Will never be used, just here for example */ GtkWidget* createPrettyPrinterConfigUI(GtkDialog * dialog) { + PrettyPrintingOptions* ppo; + GtkWidget* container; + GtkWidget* leftBox; + GtkWidget* rightBox; + GtkWidget* commentOptions; + GtkWidget* textOptions; + GtkWidget* cdataOptions; + GtkWidget* emptyOptions; + GtkWidget* indentationOptions; + GtkWidget* lineReturnOptions; + /* default printing options */ if (prettyPrintingOptions == NULL) { prettyPrintingOptions = createDefaultPrettyPrintingOptions(); } - PrettyPrintingOptions* ppo = prettyPrintingOptions; + ppo = prettyPrintingOptions; - GtkWidget* container = gtk_hbox_new(FALSE, 10); - - GtkWidget* leftBox = gtk_vbox_new(FALSE, 6); - GtkWidget* commentOptions = createThreeOptionsBox(_("Comments"), _("Put on one line"), _("Inline if possible"), _("Alignment"), ppo->oneLineComment, ppo->inlineComment, ppo->alignComment, &commentOneLine, &commentInline, &commentAlign); - GtkWidget* textOptions = createThreeOptionsBox(_("Text nodes"), _("Put on one line"), _("Inline if possible"), _("Alignment"), ppo->oneLineText, ppo->inlineText, ppo->alignText, &textOneLine, &textInline, &textAlign); - GtkWidget* cdataOptions = createThreeOptionsBox(_("CDATA"), _("Put on one line"), _("Inline if possible"), _("Alignment"), ppo->oneLineCdata, ppo->inlineCdata, ppo->alignCdata, &cdataOneLine, &cdataInline, &cdataAlign); - GtkWidget* emptyOptions = createEmptyTextOptions(ppo->emptyNodeStripping, ppo->emptyNodeStrippingSpace, ppo->forceEmptyNodeSplit); - GtkWidget* indentationOptions = createIndentationOptions(ppo->indentChar, ppo->indentLength); - GtkWidget* lineReturnOptions = createLineReturnOptions(ppo->newLineChars); + container = gtk_hbox_new(FALSE, 10); + + leftBox = gtk_vbox_new(FALSE, 6); + commentOptions = createThreeOptionsBox(_("Comments"), _("Put on one line"), _("Inline if possible"), _("Alignment"), ppo->oneLineComment, ppo->inlineComment, ppo->alignComment, &commentOneLine, &commentInline, &commentAlign); + textOptions = createThreeOptionsBox(_("Text nodes"), _("Put on one line"), _("Inline if possible"), _("Alignment"), ppo->oneLineText, ppo->inlineText, ppo->alignText, &textOneLine, &textInline, &textAlign); + cdataOptions = createThreeOptionsBox(_("CDATA"), _("Put on one line"), _("Inline if possible"), _("Alignment"), ppo->oneLineCdata, ppo->inlineCdata, ppo->alignCdata, &cdataOneLine, &cdataInline, &cdataAlign); + emptyOptions = createEmptyTextOptions(ppo->emptyNodeStripping, ppo->emptyNodeStrippingSpace, ppo->forceEmptyNodeSplit); + indentationOptions = createIndentationOptions(ppo->indentChar, ppo->indentLength); + lineReturnOptions = createLineReturnOptions(ppo->newLineChars); gtk_box_pack_start(GTK_BOX(leftBox), commentOptions, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(leftBox), textOptions, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(leftBox), cdataOptions, FALSE, FALSE, 3); - GtkWidget* rightBox = gtk_vbox_new(FALSE, 6); + rightBox = gtk_vbox_new(FALSE, 6); gtk_box_pack_start(GTK_BOX(rightBox), emptyOptions, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(rightBox), indentationOptions, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(rightBox), lineReturnOptions, FALSE, FALSE, 3); @@ -84,6 +95,7 @@ GtkWidget* createPrettyPrinterConfigUI(GtkDialog * dialog) void saveSettings(void) { + int breakStyle; PrettyPrintingOptions* ppo = prettyPrintingOptions; ppo->oneLineComment = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(commentOneLine)); @@ -105,7 +117,7 @@ void saveSettings(void) ppo->indentLength = gtk_spin_button_get_value(GTK_SPIN_BUTTON(indentationCount)); ppo->indentChar = gtk_combo_box_get_active(GTK_COMBO_BOX(indentationChar))==0 ? '\t' : ' '; - int breakStyle = gtk_combo_box_get_active(GTK_COMBO_BOX(lineBreak)); + breakStyle = gtk_combo_box_get_active(GTK_COMBO_BOX(lineBreak)); if (breakStyle == 0) ppo->newLineChars = "\r"; else if (breakStyle == 1) ppo->newLineChars = "\n"; else ppo->newLineChars = "\r\n"; @@ -252,11 +264,12 @@ static GtkWidget* createLineReturnOptions(const char* lineReturn) GtkWidget* lbl = gtk_label_new(_("Line break")); GtkWidget* comboChar = gtk_combo_box_new_text(); + int active = 0; + gtk_combo_box_append_text(GTK_COMBO_BOX(comboChar), "\\r"); gtk_combo_box_append_text(GTK_COMBO_BOX(comboChar), "\\n"); gtk_combo_box_append_text(GTK_COMBO_BOX(comboChar), "\\r\\n"); - int active = 0; if (strlen(lineReturn) == 2) active = 2; else if (lineReturn[0] == '\n') active = 1; Modified: pretty-printer/src/PluginEntry.c 25 files changed, 17 insertions(+), 8 deletions(-) =================================================================== @@ -113,25 +113,34 @@ void xml_format(GtkMenuItem* menuitem, gpointer gdata) { /* retrieves the current document */ GeanyDocument* doc = document_get_current(); + GeanyEditor* editor; + ScintillaObject* sco; + int length; + char* buffer; + xmlDoc* parsedDocument; + int result; + int xOffset; + GeanyFiletype* fileType; + g_return_if_fail(doc != NULL); - GeanyEditor* editor = doc->editor; - ScintillaObject* sco = editor->sci; + editor = doc->editor; + sco = editor->sci; /* default printing options */ if (prettyPrintingOptions == NULL) { prettyPrintingOptions = createDefaultPrettyPrintingOptions(); } /* prepare the buffer that will contain the text * from the scintilla object */ - int length = sci_get_length(sco)+1; - char* buffer = (char*)malloc(length*sizeof(char)); + length = sci_get_length(sco)+1; + buffer = (char*)malloc(length*sizeof(char)); if (buffer == NULL) { exit(-1); } /* malloc error */ /* retrieves the text */ sci_get_text(sco, length, buffer); /* checks if the data is an XML format */ - xmlDoc* parsedDocument = xmlParseDoc((unsigned char*)buffer); + parsedDocument = xmlParseDoc((unsigned char*)buffer); /* this is not a valid xml => exit with an error message */ if(parsedDocument == NULL) @@ -144,7 +153,7 @@ void xml_format(GtkMenuItem* menuitem, gpointer gdata) xmlFreeDoc(parsedDocument); /* process pretty-printing */ - int result = processXMLPrettyPrinting(&buffer, &length, prettyPrintingOptions); + result = processXMLPrettyPrinting(&buffer, &length, prettyPrintingOptions); if (result != PRETTY_PRINTING_SUCCESS) { dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to process PrettyPrinting on the specified XML because some features are not supported.\n\nSee Help > Debug messages for more details...")); @@ -155,10 +164,10 @@ void xml_format(GtkMenuItem* menuitem, gpointer gdata) sci_set_text(sco, buffer); /* set the line */ - int xOffset = scintilla_send_message(sco, SCI_GETXOFFSET, 0, 0); + xOffset = scintilla_send_message(sco, SCI_GETXOFFSET, 0, 0); scintilla_send_message(sco, SCI_LINESCROLL, -xOffset, 0); /* TODO update with the right function-call for geany-0.19 */ /* sets the type */ - GeanyFiletype* fileType = filetypes_index(GEANY_FILETYPES_XML); + fileType = filetypes_index(GEANY_FILETYPES_XML); document_set_filetype(doc, fileType); } Modified: pretty-printer/src/PrettyPrinter.c 98 files changed, 66 insertions(+), 32 deletions(-) =================================================================== @@ -88,13 +88,16 @@ static void PP_ERROR(const char* fmt, ...) int processXMLPrettyPrinting(char** buffer, int* length, PrettyPrintingOptions* ppOptions) { + bool freeOptions; + char* reallocated; + /* empty buffer, nothing to process */ if (*length == 0) { return PRETTY_PRINTING_EMPTY_XML; } if (buffer == NULL || *buffer == NULL) { return PRETTY_PRINTING_EMPTY_XML; } /* initialize the variables */ result = PRETTY_PRINTING_SUCCESS; - bool freeOptions = FALSE; + freeOptions = FALSE; if (ppOptions == NULL) { ppOptions = createDefaultPrettyPrintingOptions(); @@ -126,7 +129,7 @@ int processXMLPrettyPrinting(char** buffer, int* length, PrettyPrintingOptions* putCharInBuffer('\0'); /* adjust the final size */ - char* reallocated = (char*)realloc(xmlPrettyPrinted, xmlPrettyPrintedIndex); + reallocated = (char*)realloc(xmlPrettyPrinted, xmlPrettyPrintedIndex); if (reallocated == NULL) { PP_ERROR("Allocation error (reallocation size is %d)", xmlPrettyPrintedIndex); return PRETTY_PRINTING_SYSTEM_ERROR; } xmlPrettyPrinted = reallocated; @@ -201,9 +204,11 @@ void putCharInBuffer(char charToAdd) /* check if the buffer is full and reallocation if needed */ if (xmlPrettyPrintedIndex >= xmlPrettyPrintedLength) { + char* reallocated; + if (charToAdd == '\0') { ++xmlPrettyPrintedLength; } else { xmlPrettyPrintedLength += inputBufferLength; } - char* reallocated = (char*)realloc(xmlPrettyPrinted, xmlPrettyPrintedLength); + reallocated = (char*)realloc(xmlPrettyPrinted, xmlPrettyPrintedLength); if (reallocated == NULL) { PP_ERROR("Allocation error (char was %c)", charToAdd); return; } xmlPrettyPrinted = reallocated; } @@ -230,9 +235,11 @@ char getPreviousInsertedChar(void) int putNewLine(void) { - putCharsInBuffer(options->newLineChars); - int spaces = currentDepth*options->indentLength; + int spaces; int i; + + putCharsInBuffer(options->newLineChars); + spaces = currentDepth*options->indentLength; for(i=0 ; i<spaces ; ++i) { putCharInBuffer(options->indentChar); @@ -291,30 +298,37 @@ bool isLineBreak(char c) bool isInlineNodeAllowed(void) { + int firstChar; + int secondChar; + int thirdChar; + int currentIndex; + char currentChar; + /* the last action was not an opening => inline not allowed */ if (!lastNodeOpen) { return FALSE; } - int firstChar = getNextChar(); /* should be '<' or we are in a text node */ - int secondChar = inputBuffer[inputBufferIndex+1]; /* should be '!' */ - int thirdChar = inputBuffer[inputBufferIndex+2]; /* should be '-' or '[' */ + firstChar = getNextChar(); /* should be '<' or we are in a text node */ + secondChar = inputBuffer[inputBufferIndex+1]; /* should be '!' */ + thirdChar = inputBuffer[inputBufferIndex+2]; /* should be '-' or '[' */ /* loop through the content up to the next opening/closing node */ currentIndex = inputBufferIndex+1; if (firstChar == '<') { + char closingComment = '-'; + char oldChar = ' '; + bool loop = TRUE; + /* another node is being open ==> no inline ! */ if (secondChar != '!') { return FALSE; } /* okay we are in a comment/cdata node, so read until it is closed */ /* select the closing char */ - char closingComment = '-'; if (thirdChar == '[') { closingComment = ']'; } /* read until closing */ - char oldChar = ' '; currentIndex += 3; /* that bypass meanless chars */ - bool loop = TRUE; while (loop) { char current = inputBuffer[currentIndex]; @@ -417,21 +431,24 @@ void resetBackwardIndentation(bool resetLineBreak) int processElements(void) { int counter = 0; - ++currentDepth; bool loop = TRUE; + ++currentDepth; while (loop && result == PRETTY_PRINTING_SUCCESS) { + bool indentBackward; + char nextChar; + /* strip unused whites */ readWhites(TRUE); - char nextChar = getNextChar(); + nextChar = getNextChar(); if (nextChar == '\0') { return 0; } /* no more data to read */ /* put a new line with indentation */ if (appendIndentation) { putNewLine(); } /* always append indentation (but need to store the state) */ - bool indentBackward = appendIndentation; + indentBackward = appendIndentation; appendIndentation = TRUE; /* okay what do we have now ? */ @@ -487,6 +504,8 @@ int processElements(void) void processElementAttribute(void) { + char quote; + char value; /* process the attribute name */ char nextChar = readNextChar(); while (nextChar != '=') @@ -498,11 +517,11 @@ void processElementAttribute(void) putCharInBuffer(nextChar); /* that's the '=' */ /* read the simple quote or double quote and put it into the buffer */ - char quote = readNextChar(); + quote = readNextChar(); putCharInBuffer(quote); /* process until the last quote */ - char value = readNextChar(); + value = readNextChar(); while(value != quote) { putCharInBuffer(value); @@ -515,6 +534,7 @@ void processElementAttribute(void) void processElementAttributes(void) { + bool loop = TRUE; char current = getNextChar(); /* should not be a white */ if (isWhite(current)) { @@ -523,12 +543,13 @@ void processElementAttributes(void) return; } - bool loop = TRUE; while (loop) { + char next; + readWhites(TRUE); /* strip the whites */ - char next = getNextChar(); /* don't read the last char (processed afterwards) */ + next = getNextChar(); /* don't read the last char (processed afterwards) */ if (next == '/') { loop = FALSE; } /* end of node */ else if (next == '>') { loop = FALSE; } /* end of tag */ else if (next == '?') { loop = FALSE; } /* end of header */ @@ -569,6 +590,12 @@ void processHeader(void) void processNode(void) { + char closeChar; + int subElementsProcessed = 0; + char nextChar; + char* nodeName; + int nodeNameLength = 0; + int i; int opening = readNextChar(); if (opening != '<') { @@ -580,7 +607,6 @@ void processNode(void) putCharInBuffer(opening); /* read the node name */ - int nodeNameLength = 0; while (!isWhite(getNextChar()) && getNextChar() != '>' && /* end of the tag */ getNextChar() != '/') /* tag is being closed */ @@ -590,10 +616,9 @@ void processNode(void) } /* store the name */ - char* nodeName = (char*)malloc(sizeof(char)*nodeNameLength+1); + nodeName = (char*)malloc(sizeof(char)*nodeNameLength+1); if (nodeName == NULL) { PP_ERROR("Allocation error (node name length is %d)", nodeNameLength); return ; } nodeName[nodeNameLength] = '\0'; - int i; for (i=0 ; i<nodeNameLength ; ++i) { int tempIndex = xmlPrettyPrintedIndex-nodeNameLength+i; @@ -608,8 +633,8 @@ void processNode(void) processElementAttributes(); /* process the end of the tag */ - int subElementsProcessed = 0; - char nextChar = getNextChar(); /* should be either '/' or '>' */ + subElementsProcessed = 0; + nextChar = getNextChar(); /* should be either '/' or '>' */ if (nextChar == '/') /* the node is being closed immediatly */ { /* closing node directly */ @@ -654,7 +679,7 @@ void processNode(void) /* if the code reaches this area, then the processElements has been called and we must * close the opening tag */ - char closeChar = getNextChar(); + closeChar = getNextChar(); if (closeChar != '<') { printError("processNode : Invalid character '%c' for closing tag (should be '<')", closeChar); @@ -707,6 +732,9 @@ void processNode(void) void processComment(void) { + char lastChar; + bool loop = TRUE; + char oldChar; bool inlineAllowed = FALSE; if (options->inlineComment) { inlineAllowed = isInlineNodeAllowed(); } if (inlineAllowed && !options->oneLineComment) { inlineAllowed = isOnSingleLine(4, '-', '-'); } @@ -714,8 +742,7 @@ void processComment(void) putNextCharsInBuffer(4); /* add the chars '<!--' */ - char oldChar = '-'; - bool loop = TRUE; + oldChar = '-'; while (loop) { char nextChar = readNextChar(); @@ -795,7 +822,7 @@ void processComment(void) } } - char lastChar = readNextChar(); /* should be '>' */ + lastChar = readNextChar(); /* should be '>' */ if (lastChar != '>') { printError("processComment : last char must be '>' (not '%c')", lastChar); @@ -904,6 +931,9 @@ void processTextNode(void) void processCDATA(void) { + char lastChar; + bool loop = TRUE; + char oldChar; bool inlineAllowed = FALSE; if (options->inlineCdata) { inlineAllowed = isInlineNodeAllowed(); } if (inlineAllowed && !options->oneLineCdata) { inlineAllowed = isOnSingleLine(9, ']', ']'); } @@ -911,8 +941,7 @@ void processCDATA(void) putNextCharsInBuffer(9); /* putting the '<![CDATA[' into the buffer */ - bool loop = TRUE; - char oldChar = '['; + oldChar = '['; while(loop) { char nextChar = readNextChar(); @@ -1026,15 +1055,18 @@ void processCDATA(void) void processDoctype(void) { + bool loop = TRUE; + putNextCharsInBuffer(9); /* put the '<!DOCTYPE' into the buffer */ - bool loop = TRUE; while(loop) { + int nextChar; + readWhites(TRUE); putCharInBuffer(' '); /* only one space for the attributes */ - int nextChar = readNextChar(); + nextChar = readNextChar(); while(!isWhite(nextChar) && !isQuote(nextChar) && /* begins a quoted text */ nextChar != '=' && /* begins an attribute */ @@ -1048,6 +1080,8 @@ void processDoctype(void) if (isWhite(nextChar)) {} /* do nothing, just let the next loop do the job */ else if (isQuote(nextChar) || nextChar == '=') { + char quote; + if (nextChar == '=') { putCharInBuffer(nextChar); @@ -1062,7 +1096,7 @@ void processDoctype(void) } /* simply process the content */ - char quote = nextChar; + quote = nextChar; do { putCharInBuffer(nextChar); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] ce1094: PrettyPrinter: Don't mix declarations and code
by Colomban Wendling 08 Jul '12

08 Jul '12

Branch: refs/heads/1.22_release Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 08 Jul 2012 21:14:20 Commit: ce109470bc165581f85487fe44c543b2df76b974 https://github.com/geany/geany-plugins/commit/ce109470bc165581f85487fe44c54… Log Message: ----------- PrettyPrinter: Don't mix declarations and code Modified Paths: -------------- pretty-printer/src/ConfigUI.c pretty-printer/src/PluginEntry.c pretty-printer/src/PrettyPrinter.c Modified: pretty-printer/src/ConfigUI.c 39 files changed, 26 insertions(+), 13 deletions(-) =================================================================== @@ -52,25 +52,36 @@ /* Will never be used, just here for example */ GtkWidget* createPrettyPrinterConfigUI(GtkDialog * dialog) { + PrettyPrintingOptions* ppo; + GtkWidget* container; + GtkWidget* leftBox; + GtkWidget* rightBox; + GtkWidget* commentOptions; + GtkWidget* textOptions; + GtkWidget* cdataOptions; + GtkWidget* emptyOptions; + GtkWidget* indentationOptions; + GtkWidget* lineReturnOptions; + /* default printing options */ if (prettyPrintingOptions == NULL) { prettyPrintingOptions = createDefaultPrettyPrintingOptions(); } - PrettyPrintingOptions* ppo = prettyPrintingOptions; + ppo = prettyPrintingOptions; - GtkWidget* container = gtk_hbox_new(FALSE, 10); - - GtkWidget* leftBox = gtk_vbox_new(FALSE, 6); - GtkWidget* commentOptions = createThreeOptionsBox(_("Comments"), _("Put on one line"), _("Inline if possible"), _("Alignment"), ppo->oneLineComment, ppo->inlineComment, ppo->alignComment, &commentOneLine, &commentInline, &commentAlign); - GtkWidget* textOptions = createThreeOptionsBox(_("Text nodes"), _("Put on one line"), _("Inline if possible"), _("Alignment"), ppo->oneLineText, ppo->inlineText, ppo->alignText, &textOneLine, &textInline, &textAlign); - GtkWidget* cdataOptions = createThreeOptionsBox(_("CDATA"), _("Put on one line"), _("Inline if possible"), _("Alignment"), ppo->oneLineCdata, ppo->inlineCdata, ppo->alignCdata, &cdataOneLine, &cdataInline, &cdataAlign); - GtkWidget* emptyOptions = createEmptyTextOptions(ppo->emptyNodeStripping, ppo->emptyNodeStrippingSpace, ppo->forceEmptyNodeSplit); - GtkWidget* indentationOptions = createIndentationOptions(ppo->indentChar, ppo->indentLength); - GtkWidget* lineReturnOptions = createLineReturnOptions(ppo->newLineChars); + container = gtk_hbox_new(FALSE, 10); + + leftBox = gtk_vbox_new(FALSE, 6); + commentOptions = createThreeOptionsBox(_("Comments"), _("Put on one line"), _("Inline if possible"), _("Alignment"), ppo->oneLineComment, ppo->inlineComment, ppo->alignComment, &commentOneLine, &commentInline, &commentAlign); + textOptions = createThreeOptionsBox(_("Text nodes"), _("Put on one line"), _("Inline if possible"), _("Alignment"), ppo->oneLineText, ppo->inlineText, ppo->alignText, &textOneLine, &textInline, &textAlign); + cdataOptions = createThreeOptionsBox(_("CDATA"), _("Put on one line"), _("Inline if possible"), _("Alignment"), ppo->oneLineCdata, ppo->inlineCdata, ppo->alignCdata, &cdataOneLine, &cdataInline, &cdataAlign); + emptyOptions = createEmptyTextOptions(ppo->emptyNodeStripping, ppo->emptyNodeStrippingSpace, ppo->forceEmptyNodeSplit); + indentationOptions = createIndentationOptions(ppo->indentChar, ppo->indentLength); + lineReturnOptions = createLineReturnOptions(ppo->newLineChars); gtk_box_pack_start(GTK_BOX(leftBox), commentOptions, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(leftBox), textOptions, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(leftBox), cdataOptions, FALSE, FALSE, 3); - GtkWidget* rightBox = gtk_vbox_new(FALSE, 6); + rightBox = gtk_vbox_new(FALSE, 6); gtk_box_pack_start(GTK_BOX(rightBox), emptyOptions, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(rightBox), indentationOptions, FALSE, FALSE, 3); gtk_box_pack_start(GTK_BOX(rightBox), lineReturnOptions, FALSE, FALSE, 3); @@ -84,6 +95,7 @@ GtkWidget* createPrettyPrinterConfigUI(GtkDialog * dialog) void saveSettings(void) { + int breakStyle; PrettyPrintingOptions* ppo = prettyPrintingOptions; ppo->oneLineComment = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(commentOneLine)); @@ -105,7 +117,7 @@ void saveSettings(void) ppo->indentLength = gtk_spin_button_get_value(GTK_SPIN_BUTTON(indentationCount)); ppo->indentChar = gtk_combo_box_get_active(GTK_COMBO_BOX(indentationChar))==0 ? '\t' : ' '; - int breakStyle = gtk_combo_box_get_active(GTK_COMBO_BOX(lineBreak)); + breakStyle = gtk_combo_box_get_active(GTK_COMBO_BOX(lineBreak)); if (breakStyle == 0) ppo->newLineChars = "\r"; else if (breakStyle == 1) ppo->newLineChars = "\n"; else ppo->newLineChars = "\r\n"; @@ -252,11 +264,12 @@ static GtkWidget* createLineReturnOptions(const char* lineReturn) GtkWidget* lbl = gtk_label_new(_("Line break")); GtkWidget* comboChar = gtk_combo_box_new_text(); + int active = 0; + gtk_combo_box_append_text(GTK_COMBO_BOX(comboChar), "\\r"); gtk_combo_box_append_text(GTK_COMBO_BOX(comboChar), "\\n"); gtk_combo_box_append_text(GTK_COMBO_BOX(comboChar), "\\r\\n"); - int active = 0; if (strlen(lineReturn) == 2) active = 2; else if (lineReturn[0] == '\n') active = 1; Modified: pretty-printer/src/PluginEntry.c 25 files changed, 17 insertions(+), 8 deletions(-) =================================================================== @@ -113,25 +113,34 @@ void xml_format(GtkMenuItem* menuitem, gpointer gdata) { /* retrieves the current document */ GeanyDocument* doc = document_get_current(); + GeanyEditor* editor; + ScintillaObject* sco; + int length; + char* buffer; + xmlDoc* parsedDocument; + int result; + int xOffset; + GeanyFiletype* fileType; + g_return_if_fail(doc != NULL); - GeanyEditor* editor = doc->editor; - ScintillaObject* sco = editor->sci; + editor = doc->editor; + sco = editor->sci; /* default printing options */ if (prettyPrintingOptions == NULL) { prettyPrintingOptions = createDefaultPrettyPrintingOptions(); } /* prepare the buffer that will contain the text * from the scintilla object */ - int length = sci_get_length(sco)+1; - char* buffer = (char*)malloc(length*sizeof(char)); + length = sci_get_length(sco)+1; + buffer = (char*)malloc(length*sizeof(char)); if (buffer == NULL) { exit(-1); } /* malloc error */ /* retrieves the text */ sci_get_text(sco, length, buffer); /* checks if the data is an XML format */ - xmlDoc* parsedDocument = xmlParseDoc((unsigned char*)buffer); + parsedDocument = xmlParseDoc((unsigned char*)buffer); /* this is not a valid xml => exit with an error message */ if(parsedDocument == NULL) @@ -144,7 +153,7 @@ void xml_format(GtkMenuItem* menuitem, gpointer gdata) xmlFreeDoc(parsedDocument); /* process pretty-printing */ - int result = processXMLPrettyPrinting(&buffer, &length, prettyPrintingOptions); + result = processXMLPrettyPrinting(&buffer, &length, prettyPrintingOptions); if (result != PRETTY_PRINTING_SUCCESS) { dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to process PrettyPrinting on the specified XML because some features are not supported.\n\nSee Help > Debug messages for more details...")); @@ -155,10 +164,10 @@ void xml_format(GtkMenuItem* menuitem, gpointer gdata) sci_set_text(sco, buffer); /* set the line */ - int xOffset = scintilla_send_message(sco, SCI_GETXOFFSET, 0, 0); + xOffset = scintilla_send_message(sco, SCI_GETXOFFSET, 0, 0); scintilla_send_message(sco, SCI_LINESCROLL, -xOffset, 0); /* TODO update with the right function-call for geany-0.19 */ /* sets the type */ - GeanyFiletype* fileType = filetypes_index(GEANY_FILETYPES_XML); + fileType = filetypes_index(GEANY_FILETYPES_XML); document_set_filetype(doc, fileType); } Modified: pretty-printer/src/PrettyPrinter.c 98 files changed, 66 insertions(+), 32 deletions(-) =================================================================== @@ -88,13 +88,16 @@ static void PP_ERROR(const char* fmt, ...) int processXMLPrettyPrinting(char** buffer, int* length, PrettyPrintingOptions* ppOptions) { + bool freeOptions; + char* reallocated; + /* empty buffer, nothing to process */ if (*length == 0) { return PRETTY_PRINTING_EMPTY_XML; } if (buffer == NULL || *buffer == NULL) { return PRETTY_PRINTING_EMPTY_XML; } /* initialize the variables */ result = PRETTY_PRINTING_SUCCESS; - bool freeOptions = FALSE; + freeOptions = FALSE; if (ppOptions == NULL) { ppOptions = createDefaultPrettyPrintingOptions(); @@ -126,7 +129,7 @@ int processXMLPrettyPrinting(char** buffer, int* length, PrettyPrintingOptions* putCharInBuffer('\0'); /* adjust the final size */ - char* reallocated = (char*)realloc(xmlPrettyPrinted, xmlPrettyPrintedIndex); + reallocated = (char*)realloc(xmlPrettyPrinted, xmlPrettyPrintedIndex); if (reallocated == NULL) { PP_ERROR("Allocation error (reallocation size is %d)", xmlPrettyPrintedIndex); return PRETTY_PRINTING_SYSTEM_ERROR; } xmlPrettyPrinted = reallocated; @@ -201,9 +204,11 @@ void putCharInBuffer(char charToAdd) /* check if the buffer is full and reallocation if needed */ if (xmlPrettyPrintedIndex >= xmlPrettyPrintedLength) { + char* reallocated; + if (charToAdd == '\0') { ++xmlPrettyPrintedLength; } else { xmlPrettyPrintedLength += inputBufferLength; } - char* reallocated = (char*)realloc(xmlPrettyPrinted, xmlPrettyPrintedLength); + reallocated = (char*)realloc(xmlPrettyPrinted, xmlPrettyPrintedLength); if (reallocated == NULL) { PP_ERROR("Allocation error (char was %c)", charToAdd); return; } xmlPrettyPrinted = reallocated; } @@ -230,9 +235,11 @@ char getPreviousInsertedChar(void) int putNewLine(void) { - putCharsInBuffer(options->newLineChars); - int spaces = currentDepth*options->indentLength; + int spaces; int i; + + putCharsInBuffer(options->newLineChars); + spaces = currentDepth*options->indentLength; for(i=0 ; i<spaces ; ++i) { putCharInBuffer(options->indentChar); @@ -291,30 +298,37 @@ bool isLineBreak(char c) bool isInlineNodeAllowed(void) { + int firstChar; + int secondChar; + int thirdChar; + int currentIndex; + char currentChar; + /* the last action was not an opening => inline not allowed */ if (!lastNodeOpen) { return FALSE; } - int firstChar = getNextChar(); /* should be '<' or we are in a text node */ - int secondChar = inputBuffer[inputBufferIndex+1]; /* should be '!' */ - int thirdChar = inputBuffer[inputBufferIndex+2]; /* should be '-' or '[' */ + firstChar = getNextChar(); /* should be '<' or we are in a text node */ + secondChar = inputBuffer[inputBufferIndex+1]; /* should be '!' */ + thirdChar = inputBuffer[inputBufferIndex+2]; /* should be '-' or '[' */ /* loop through the content up to the next opening/closing node */ currentIndex = inputBufferIndex+1; if (firstChar == '<') { + char closingComment = '-'; + char oldChar = ' '; + bool loop = TRUE; + /* another node is being open ==> no inline ! */ if (secondChar != '!') { return FALSE; } /* okay we are in a comment/cdata node, so read until it is closed */ /* select the closing char */ - char closingComment = '-'; if (thirdChar == '[') { closingComment = ']'; } /* read until closing */ - char oldChar = ' '; currentIndex += 3; /* that bypass meanless chars */ - bool loop = TRUE; while (loop) { char current = inputBuffer[currentIndex]; @@ -417,21 +431,24 @@ void resetBackwardIndentation(bool resetLineBreak) int processElements(void) { int counter = 0; - ++currentDepth; bool loop = TRUE; + ++currentDepth; while (loop && result == PRETTY_PRINTING_SUCCESS) { + bool indentBackward; + char nextChar; + /* strip unused whites */ readWhites(TRUE); - char nextChar = getNextChar(); + nextChar = getNextChar(); if (nextChar == '\0') { return 0; } /* no more data to read */ /* put a new line with indentation */ if (appendIndentation) { putNewLine(); } /* always append indentation (but need to store the state) */ - bool indentBackward = appendIndentation; + indentBackward = appendIndentation; appendIndentation = TRUE; /* okay what do we have now ? */ @@ -487,6 +504,8 @@ int processElements(void) void processElementAttribute(void) { + char quote; + char value; /* process the attribute name */ char nextChar = readNextChar(); while (nextChar != '=') @@ -498,11 +517,11 @@ void processElementAttribute(void) putCharInBuffer(nextChar); /* that's the '=' */ /* read the simple quote or double quote and put it into the buffer */ - char quote = readNextChar(); + quote = readNextChar(); putCharInBuffer(quote); /* process until the last quote */ - char value = readNextChar(); + value = readNextChar(); while(value != quote) { putCharInBuffer(value); @@ -515,6 +534,7 @@ void processElementAttribute(void) void processElementAttributes(void) { + bool loop = TRUE; char current = getNextChar(); /* should not be a white */ if (isWhite(current)) { @@ -523,12 +543,13 @@ void processElementAttributes(void) return; } - bool loop = TRUE; while (loop) { + char next; + readWhites(TRUE); /* strip the whites */ - char next = getNextChar(); /* don't read the last char (processed afterwards) */ + next = getNextChar(); /* don't read the last char (processed afterwards) */ if (next == '/') { loop = FALSE; } /* end of node */ else if (next == '>') { loop = FALSE; } /* end of tag */ else if (next == '?') { loop = FALSE; } /* end of header */ @@ -569,6 +590,12 @@ void processHeader(void) void processNode(void) { + char closeChar; + int subElementsProcessed = 0; + char nextChar; + char* nodeName; + int nodeNameLength = 0; + int i; int opening = readNextChar(); if (opening != '<') { @@ -580,7 +607,6 @@ void processNode(void) putCharInBuffer(opening); /* read the node name */ - int nodeNameLength = 0; while (!isWhite(getNextChar()) && getNextChar() != '>' && /* end of the tag */ getNextChar() != '/') /* tag is being closed */ @@ -590,10 +616,9 @@ void processNode(void) } /* store the name */ - char* nodeName = (char*)malloc(sizeof(char)*nodeNameLength+1); + nodeName = (char*)malloc(sizeof(char)*nodeNameLength+1); if (nodeName == NULL) { PP_ERROR("Allocation error (node name length is %d)", nodeNameLength); return ; } nodeName[nodeNameLength] = '\0'; - int i; for (i=0 ; i<nodeNameLength ; ++i) { int tempIndex = xmlPrettyPrintedIndex-nodeNameLength+i; @@ -608,8 +633,8 @@ void processNode(void) processElementAttributes(); /* process the end of the tag */ - int subElementsProcessed = 0; - char nextChar = getNextChar(); /* should be either '/' or '>' */ + subElementsProcessed = 0; + nextChar = getNextChar(); /* should be either '/' or '>' */ if (nextChar == '/') /* the node is being closed immediatly */ { /* closing node directly */ @@ -654,7 +679,7 @@ void processNode(void) /* if the code reaches this area, then the processElements has been called and we must * close the opening tag */ - char closeChar = getNextChar(); + closeChar = getNextChar(); if (closeChar != '<') { printError("processNode : Invalid character '%c' for closing tag (should be '<')", closeChar); @@ -707,6 +732,9 @@ void processNode(void) void processComment(void) { + char lastChar; + bool loop = TRUE; + char oldChar; bool inlineAllowed = FALSE; if (options->inlineComment) { inlineAllowed = isInlineNodeAllowed(); } if (inlineAllowed && !options->oneLineComment) { inlineAllowed = isOnSingleLine(4, '-', '-'); } @@ -714,8 +742,7 @@ void processComment(void) putNextCharsInBuffer(4); /* add the chars '<!--' */ - char oldChar = '-'; - bool loop = TRUE; + oldChar = '-'; while (loop) { char nextChar = readNextChar(); @@ -795,7 +822,7 @@ void processComment(void) } } - char lastChar = readNextChar(); /* should be '>' */ + lastChar = readNextChar(); /* should be '>' */ if (lastChar != '>') { printError("processComment : last char must be '>' (not '%c')", lastChar); @@ -904,6 +931,9 @@ void processTextNode(void) void processCDATA(void) { + char lastChar; + bool loop = TRUE; + char oldChar; bool inlineAllowed = FALSE; if (options->inlineCdata) { inlineAllowed = isInlineNodeAllowed(); } if (inlineAllowed && !options->oneLineCdata) { inlineAllowed = isOnSingleLine(9, ']', ']'); } @@ -911,8 +941,7 @@ void processCDATA(void) putNextCharsInBuffer(9); /* putting the '<![CDATA[' into the buffer */ - bool loop = TRUE; - char oldChar = '['; + oldChar = '['; while(loop) { char nextChar = readNextChar(); @@ -1026,15 +1055,18 @@ void processCDATA(void) void processDoctype(void) { + bool loop = TRUE; + putNextCharsInBuffer(9); /* put the '<!DOCTYPE' into the buffer */ - bool loop = TRUE; while(loop) { + int nextChar; + readWhites(TRUE); putCharInBuffer(' '); /* only one space for the attributes */ - int nextChar = readNextChar(); + nextChar = readNextChar(); while(!isWhite(nextChar) && !isQuote(nextChar) && /* begins a quoted text */ nextChar != '=' && /* begins an attribute */ @@ -1048,6 +1080,8 @@ void processDoctype(void) if (isWhite(nextChar)) {} /* do nothing, just let the next loop do the job */ else if (isQuote(nextChar) || nextChar == '=') { + char quote; + if (nextChar == '=') { putCharInBuffer(nextChar); @@ -1062,7 +1096,7 @@ void processDoctype(void) } /* simply process the content */ - char quote = nextChar; + quote = nextChar; do { putCharInBuffer(nextChar); @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] b38189: PrettyPrinter: Don't use C++-style comments
by Colomban Wendling 08 Jul '12

08 Jul '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 08 Jul 2012 21:10:53 Commit: b38189f5380a84cc2ae437254dd78ec4dae839ba https://github.com/geany/geany-plugins/commit/b38189f5380a84cc2ae437254dd78… Log Message: ----------- PrettyPrinter: Don't use C++-style comments Modified Paths: -------------- pretty-printer/src/ConfigUI.c pretty-printer/src/ConfigUI.h pretty-printer/src/PluginEntry.c pretty-printer/src/PluginEntry.h pretty-printer/src/PrettyPrinter.c pretty-printer/src/PrettyPrinter.h Modified: pretty-printer/src/ConfigUI.c 16 files changed, 8 insertions(+), 8 deletions(-) =================================================================== @@ -18,15 +18,15 @@ #include "ConfigUI.h" -//======================= FUNCTIONS ==================================================================== +/*======================= FUNCTIONS ====================================================================*/ -//static GtkWidget* createTwoOptionsBox(const char* label, const char* checkBox1, const char* checkBox2, gboolean cb1Active, gboolean cb2Active, GtkWidget** option1, GtkWidget** option2); +/*static GtkWidget* createTwoOptionsBox(const char* label, const char* checkBox1, const char* checkBox2, gboolean cb1Active, gboolean cb2Active, GtkWidget** option1, GtkWidget** option2);*/ static GtkWidget* createThreeOptionsBox(const char* label, const char* checkBox1, const char* checkBox2, const char* checkBox3, gboolean cb1Active, gboolean cb2Active, gboolean cb3Active, GtkWidget** option1, GtkWidget** option2, GtkWidget** option3); static GtkWidget* createEmptyTextOptions(gboolean emptyNodeStripping, gboolean emptyNodeStrippingSpace, gboolean forceEmptyNodeSplit); static GtkWidget* createIndentationOptions(char indentation, int count); static GtkWidget* createLineReturnOptions(const char* lineReturn); -//============================================ PRIVATE PROPERTIES ====================================== +/*============================================ PRIVATE PROPERTIES ======================================*/ static GtkWidget* commentOneLine; static GtkWidget* commentInline; @@ -44,15 +44,15 @@ static GtkWidget* indentationCount; static GtkWidget* lineBreak; -//============================================= PUBLIC FUNCTIONS ======================================== +/*============================================= PUBLIC FUNCTIONS ========================================*/ -//redeclaration of extern variable +/* redeclaration of extern variable */ PrettyPrintingOptions* prettyPrintingOptions; -//Will never be used, just here for example +/* Will never be used, just here for example */ GtkWidget* createPrettyPrinterConfigUI(GtkDialog * dialog) { - //default printing options + /* default printing options */ if (prettyPrintingOptions == NULL) { prettyPrintingOptions = createDefaultPrettyPrintingOptions(); } PrettyPrintingOptions* ppo = prettyPrintingOptions; @@ -111,7 +111,7 @@ void saveSettings(void) else ppo->newLineChars = "\r\n"; } -//============================================= PRIVATE FUNCTIONS ======================================= +/*============================================= PRIVATE FUNCTIONS =======================================*/ /*GtkWidget* createTwoOptionsBox(const char* label, const char* checkBox1, Modified: pretty-printer/src/ConfigUI.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -19,7 +19,7 @@ #ifndef PP_CONFIG_UI_H #define PP_CONFIG_UI_H -//========================================== INCLUDES ========================================================= +/*========================================== INCLUDES =========================================================*/ #include <gtk/gtk.h> @@ -30,11 +30,11 @@ #include "PrettyPrinter.h" -//========================================== VARIABLES ======================================================== +/*========================================== VARIABLES ========================================================*/ extern PrettyPrintingOptions* prettyPrintingOptions; -//========================================== FUNCTIONS ======================================================== +/*========================================== FUNCTIONS ========================================================*/ GtkWidget* createPrettyPrinterConfigUI(GtkDialog* dialog); void saveSettings(void); Modified: pretty-printer/src/PluginEntry.c 56 files changed, 28 insertions(+), 28 deletions(-) =================================================================== @@ -28,7 +28,7 @@ GeanyData* geany_data; GeanyFunctions* geany_functions; -//========================================== PLUGIN INFORMATION ========================================================== +/*========================================== PLUGIN INFORMATION ==========================================================*/ PLUGIN_VERSION_CHECK(130) PLUGIN_SET_TRANSLATABLE_INFO( @@ -39,11 +39,11 @@ PRETTY_PRINTER_VERSION, "Cédric Tabin - http://www.astorm.ch") PLUGIN_KEY_GROUP(prettyprinter, 1) -//========================================== DECLARATIONS ================================================================ +/*========================================== DECLARATIONS ================================================================*/ -static GtkWidget* main_menu_item = NULL; //the main menu of the plugin +static GtkWidget* main_menu_item = NULL; /*the main menu of the plugin*/ -//declaration of the functions +/* declaration of the functions */ static void xml_format(GtkMenuItem *menuitem, gpointer gdata); static void kb_run_xml_pretty_print(G_GNUC_UNUSED guint key_id); static void config_closed(GtkWidget* configWidget, gint response, gpointer data); @@ -52,51 +52,51 @@ void plugin_cleanup(void); GtkWidget* plugin_configure(GtkDialog * dialog); -//========================================== FUNCTIONS =================================================================== +/*========================================== FUNCTIONS ===================================================================*/ void plugin_init(GeanyData *data) { - //initializes the libxml2 + /* initializes the libxml2 */ LIBXML_TEST_VERSION - //mutilanguage support + /* mutilanguage support */ main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); - //put the menu into the Tools + /* put the menu into the Tools */ main_menu_item = gtk_menu_item_new_with_mnemonic(_("PrettyPrinter XML")); ui_add_document_sensitive(main_menu_item); gtk_widget_show(main_menu_item); gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), main_menu_item); - //init keybindings + /* init keybindings */ keybindings_set_item(plugin_key_group, 0, kb_run_xml_pretty_print, 0, 0, "run_pretty_printer_xml", _("Run the PrettyPrinter XML"), main_menu_item); - //add activation callback + /* add activation callback */ g_signal_connect(main_menu_item, "activate", G_CALLBACK(xml_format), NULL); } void plugin_cleanup(void) { - //destroys the plugin + /* destroys the plugin */ gtk_widget_destroy(main_menu_item); } GtkWidget* plugin_configure(GtkDialog * dialog) { - //creates the configuration widget + /* creates the configuration widget */ GtkWidget* widget = createPrettyPrinterConfigUI(dialog); g_signal_connect(dialog, "response", G_CALLBACK(config_closed), NULL); return widget; } -//========================================== LISTENERS =================================================================== +/*========================================== LISTENERS ===================================================================*/ void config_closed(GtkWidget* configWidget, gint response, gpointer gdata) { - //if the user clicked OK or APPLY, then save the settings + /* if the user clicked OK or APPLY, then save the settings */ if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) { @@ -111,39 +111,39 @@ void kb_run_xml_pretty_print(G_GNUC_UNUSED guint key_id) void xml_format(GtkMenuItem* menuitem, gpointer gdata) { - //retrieves the current document + /* retrieves the current document */ GeanyDocument* doc = document_get_current(); g_return_if_fail(doc != NULL); GeanyEditor* editor = doc->editor; ScintillaObject* sco = editor->sci; - //default printing options + /* default printing options */ if (prettyPrintingOptions == NULL) { prettyPrintingOptions = createDefaultPrettyPrintingOptions(); } - //prepare the buffer that will contain the text - //from the scintilla object + /* prepare the buffer that will contain the text + * from the scintilla object */ int length = sci_get_length(sco)+1; char* buffer = (char*)malloc(length*sizeof(char)); - if (buffer == NULL) { exit(-1); } //malloc error + if (buffer == NULL) { exit(-1); } /* malloc error */ - //retrieves the text + /* retrieves the text */ sci_get_text(sco, length, buffer); - //checks if the data is an XML format + /* checks if the data is an XML format */ xmlDoc* parsedDocument = xmlParseDoc((unsigned char*)buffer); - //this is not a valid xml => exit with an error message + /* this is not a valid xml => exit with an error message */ if(parsedDocument == NULL) { dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to parse the content as XML.")); return; } - //free all + /* free all */ xmlFreeDoc(parsedDocument); - //process pretty-printing + /* process pretty-printing */ int result = processXMLPrettyPrinting(&buffer, &length, prettyPrintingOptions); if (result != PRETTY_PRINTING_SUCCESS) { @@ -151,14 +151,14 @@ void xml_format(GtkMenuItem* menuitem, gpointer gdata) return; } - //updates the document + /* updates the document */ sci_set_text(sco, buffer); - //set the line + /* set the line */ int xOffset = scintilla_send_message(sco, SCI_GETXOFFSET, 0, 0); - scintilla_send_message(sco, SCI_LINESCROLL, -xOffset, 0); //TODO update with the right function-call for geany-0.19 + scintilla_send_message(sco, SCI_LINESCROLL, -xOffset, 0); /* TODO update with the right function-call for geany-0.19 */ - //sets the type + /* sets the type */ GeanyFiletype* fileType = filetypes_index(GEANY_FILETYPES_XML); document_set_filetype(doc, fileType); } Modified: pretty-printer/src/PluginEntry.h 6 files changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -19,7 +19,7 @@ #ifndef PLUGIN_ENTRY_H #define PLUGIN_ENTRY_H -//========================================== INCLUDES ========================================================== +/*========================================== INCLUDES ==========================================================*/ #include <stdlib.h> #include <stdio.h> @@ -34,8 +34,8 @@ #include "PrettyPrinter.h" #include "ConfigUI.h" -//========================================== PROPERTIES ======================================================== +/*========================================== PROPERTIES ========================================================*/ -//========================================== FUNCTIONS ========================================================= +/*========================================== FUNCTIONS =========================================================*/ #endif Modified: pretty-printer/src/PrettyPrinter.c 458 files changed, 229 insertions(+), 229 deletions(-) =================================================================== @@ -18,63 +18,63 @@ #include "PrettyPrinter.h" -//======================= FUNCTIONS ==================================================================== +/*======================= FUNCTIONS ====================================================================*/ -//error reporting functions -static void PP_ERROR(const char* fmt, ...) G_GNUC_PRINTF(1,2); //prints an error message +/* error reporting functions */ +static void PP_ERROR(const char* fmt, ...) G_GNUC_PRINTF(1,2); /* prints an error message */ -//xml pretty printing functions -static void putCharInBuffer(char charToAdd); //put a char into the new char buffer -static void putCharsInBuffer(const char* charsToAdd); //put the chars into the new char buffer -static void putNextCharsInBuffer(int nbChars); //put the next nbChars of the input buffer into the new buffer -static int readWhites(bool considerLineBreakAsWhite); //read the next whites into the input buffer -static char readNextChar(void); //read the next char into the input buffer; -static char getNextChar(void); //returns the next char but do not increase the input buffer index (use readNextChar for that) -static char getPreviousInsertedChar(void); //returns the last inserted char into the new buffer -static bool isWhite(char c); //check if the specified char is a white -static bool isSpace(char c); //check if the specified char is a space -static bool isLineBreak(char c); //check if the specified char is a new line -static bool isQuote(char c); //check if the specified char is a quote (simple or double) -static int putNewLine(void); //put a new line into the new char buffer with the correct number of whites (indentation) -static bool isInlineNodeAllowed(void); //check if it is possible to have an inline node -static bool isOnSingleLine(int skip, char stop1, char stop2); //check if the current node data is on one line (for inlining) -static void resetBackwardIndentation(bool resetLineBreak); //reset the indentation for the current depth (just reset the index in fact) +/* xml pretty printing functions */ +static void putCharInBuffer(char charToAdd); /* put a char into the new char buffer */ +static void putCharsInBuffer(const char* charsToAdd); /* put the chars into the new char buffer */ +static void putNextCharsInBuffer(int nbChars); /* put the next nbChars of the input buffer into the new buffer */ +static int readWhites(bool considerLineBreakAsWhite); /* read the next whites into the input buffer */ +static char readNextChar(void); /* read the next char into the input buffer; */ +static char getNextChar(void); /* returns the next char but do not increase the input buffer index (use readNextChar for that) */ +static char getPreviousInsertedChar(void); /* returns the last inserted char into the new buffer */ +static bool isWhite(char c); /* check if the specified char is a white */ +static bool isSpace(char c); /* check if the specified char is a space */ +static bool isLineBreak(char c); /* check if the specified char is a new line */ +static bool isQuote(char c); /* check if the specified char is a quote (simple or double) */ +static int putNewLine(void); /* put a new line into the new char buffer with the correct number of whites (indentation) */ +static bool isInlineNodeAllowed(void); /* check if it is possible to have an inline node */ +static bool isOnSingleLine(int skip, char stop1, char stop2); /* check if the current node data is on one line (for inlining) */ +static void resetBackwardIndentation(bool resetLineBreak); /* reset the indentation for the current depth (just reset the index in fact) */ -//specific parsing functions -static int processElements(void); //returns the number of elements processed -static void processElementAttribute(void); //process on attribute of a node -static void processElementAttributes(void); //process all the attributes of a node -static void processHeader(void); //process the header <?xml version="..." ?> -static void processNode(void); //process an XML node -static void processTextNode(void); //process a text node -static void processComment(void); //process a comment -static void processCDATA(void); //process a CDATA node -static void processDoctype(void); //process a DOCTYPE node -static void processDoctypeElement(void); //process a DOCTYPE ELEMENT node +/* specific parsing functions */ +static int processElements(void); /* returns the number of elements processed */ +static void processElementAttribute(void); /* process on attribute of a node */ +static void processElementAttributes(void); /* process all the attributes of a node */ +static void processHeader(void); /* process the header <?xml version="..." ?> */ +static void processNode(void); /* process an XML node */ +static void processTextNode(void); /* process a text node */ +static void processComment(void); /* process a comment */ +static void processCDATA(void); /* process a CDATA node */ +static void processDoctype(void); /* process a DOCTYPE node */ +static void processDoctypeElement(void); /* process a DOCTYPE ELEMENT node */ -//debug function -static void printError(const char *msg, ...) G_GNUC_PRINTF(1,2); //just print a message like the printf method -static void printDebugStatus(void); //just print some variables into the console for debugging +/* debug function */ +static void printError(const char *msg, ...) G_GNUC_PRINTF(1,2); /* just print a message like the printf method */ +static void printDebugStatus(void); /* just print some variables into the console for debugging */ -//============================================ PRIVATE PROPERTIES ====================================== +/*============================================ PRIVATE PROPERTIES ======================================*/ -//those are variables that are shared by the functions and -//shouldn't be altered. +/* those are variables that are shared by the functions and + * shouldn't be altered. */ -static int result; //result of the pretty printing -static char* xmlPrettyPrinted; //new buffer for the formatted XML -static int xmlPrettyPrintedLength; //buffer size -static int xmlPrettyPrintedIndex; //buffer index (position of the next char to insert) -static char* inputBuffer; //input buffer -static int inputBufferLength; //input buffer size -static int inputBufferIndex; //input buffer index (position of the next char to read into the input string) -static int currentDepth; //current depth (for indentation) -static char* currentNodeName; //current node name -static bool appendIndentation; //if the indentation must be added (with a line break before) -static bool lastNodeOpen; //defines if the last action was a not opening or not -static PrettyPrintingOptions* options; //options of PrettyPrinting +static int result; /* result of the pretty printing */ +static char* xmlPrettyPrinted; /* new buffer for the formatted XML */ +static int xmlPrettyPrintedLength; /* buffer size */ +static int xmlPrettyPrintedIndex; /* buffer index (position of the next char to insert) */ +static char* inputBuffer; /* input buffer */ +static int inputBufferLength; /* input buffer size */ +static int inputBufferIndex; /* input buffer index (position of the next char to read into the input string) */ +static int currentDepth; /* current depth (for indentation) */ +static char* currentNodeName; /* current node name */ +static bool appendIndentation; /* if the indentation must be added (with a line break before) */ +static bool lastNodeOpen; /* defines if the last action was a not opening or not */ +static PrettyPrintingOptions* options; /* options of PrettyPrinting */ -//============================================ GENERAL FUNCTIONS ======================================= +/*============================================ GENERAL FUNCTIONS =======================================*/ static void PP_ERROR(const char* fmt, ...) { @@ -88,11 +88,11 @@ static void PP_ERROR(const char* fmt, ...) int processXMLPrettyPrinting(char** buffer, int* length, PrettyPrintingOptions* ppOptions) { - //empty buffer, nothing to process + /* empty buffer, nothing to process */ if (*length == 0) { return PRETTY_PRINTING_EMPTY_XML; } if (buffer == NULL || *buffer == NULL) { return PRETTY_PRINTING_EMPTY_XML; } - //initialize the variables + /* initialize the variables */ result = PRETTY_PRINTING_SUCCESS; bool freeOptions = FALSE; if (ppOptions == NULL) @@ -116,43 +116,43 @@ int processXMLPrettyPrinting(char** buffer, int* length, PrettyPrintingOptions* xmlPrettyPrinted = (char*)malloc(sizeof(char)*(*length)); if (xmlPrettyPrinted == NULL) { PP_ERROR("Allocation error (initialisation)"); return PRETTY_PRINTING_SYSTEM_ERROR; } - //go to the first char + /* go to the first char */ readWhites(TRUE); - //process the pretty-printing + /* process the pretty-printing */ processElements(); - //close the buffer + /* close the buffer */ putCharInBuffer('\0'); - //adjust the final size + /* adjust the final size */ char* reallocated = (char*)realloc(xmlPrettyPrinted, xmlPrettyPrintedIndex); if (reallocated == NULL) { PP_ERROR("Allocation error (reallocation size is %d)", xmlPrettyPrintedIndex); return PRETTY_PRINTING_SYSTEM_ERROR; } xmlPrettyPrinted = reallocated; - //freeing the unused values + /* freeing the unused values */ if (freeOptions) { free(options); } - //if success, then update the values + /* if success, then update the values */ if (result == PRETTY_PRINTING_SUCCESS) { free(*buffer); *buffer = xmlPrettyPrinted; - *length = xmlPrettyPrintedIndex-2; //the '\0' is not in the length + *length = xmlPrettyPrintedIndex-2; /* the '\0' is not in the length */ } - //else clean the other values + /* else clean the other values */ else { free(xmlPrettyPrinted); } - //updating the pointers for the using into the caller function - xmlPrettyPrinted = NULL; //avoid reference - inputBuffer = NULL; //avoid reference - currentNodeName = NULL; //avoid reference - options = NULL; //avoid reference + /* updating the pointers for the using into the caller function */ + xmlPrettyPrinted = NULL; /* avoid reference */ + inputBuffer = NULL; /* avoid reference */ + currentNodeName = NULL; /* avoid reference */ + options = NULL; /* avoid reference */ - //and finally the result + /* and finally the result */ return result; } @@ -198,7 +198,7 @@ void putNextCharsInBuffer(int nbChars) void putCharInBuffer(char charToAdd) { - //check if the buffer is full and reallocation if needed + /* check if the buffer is full and reallocation if needed */ if (xmlPrettyPrintedIndex >= xmlPrettyPrintedLength) { if (charToAdd == '\0') { ++xmlPrettyPrintedLength; } @@ -208,7 +208,7 @@ void putCharInBuffer(char charToAdd) xmlPrettyPrinted = reallocated; } - //putting the char and increase the index for the next one + /* putting the char and increase the index for the next one */ xmlPrettyPrinted[xmlPrettyPrintedIndex] = charToAdd; ++xmlPrettyPrintedIndex; } @@ -291,70 +291,70 @@ bool isLineBreak(char c) bool isInlineNodeAllowed(void) { - //the last action was not an opening => inline not allowed + /* the last action was not an opening => inline not allowed */ if (!lastNodeOpen) { return FALSE; } - int firstChar = getNextChar(); //should be '<' or we are in a text node - int secondChar = inputBuffer[inputBufferIndex+1]; //should be '!' - int thirdChar = inputBuffer[inputBufferIndex+2]; //should be '-' or '[' + int firstChar = getNextChar(); /* should be '<' or we are in a text node */ + int secondChar = inputBuffer[inputBufferIndex+1]; /* should be '!' */ + int thirdChar = inputBuffer[inputBufferIndex+2]; /* should be '-' or '[' */ - //loop through the content up to the next opening/closing node - int currentIndex = inputBufferIndex+1; + /* loop through the content up to the next opening/closing node */ + currentIndex = inputBufferIndex+1; if (firstChar == '<') { - //another node is being open ==> no inline ! + /* another node is being open ==> no inline ! */ if (secondChar != '!') { return FALSE; } - //okay we are in a comment/cdata node, so read until it is closed + /* okay we are in a comment/cdata node, so read until it is closed */ - //select the closing char + /* select the closing char */ char closingComment = '-'; if (thirdChar == '[') { closingComment = ']'; } - //read until closing + /* read until closing */ char oldChar = ' '; - currentIndex += 3; //that bypass meanless chars + currentIndex += 3; /* that bypass meanless chars */ bool loop = TRUE; while (loop) { char current = inputBuffer[currentIndex]; - if (current == closingComment && oldChar == closingComment) { loop = FALSE; } //end of comment/cdata + if (current == closingComment && oldChar == closingComment) { loop = FALSE; } /* end of comment/cdata */ oldChar = current; ++currentIndex; } - //okay now avoid blanks - // inputBuffer[index] is now '>' + /* okay now avoid blanks */ + /* inputBuffer[index] is now '>' */ ++currentIndex; while (isWhite(inputBuffer[currentIndex])) { ++currentIndex; } } else { - //this is a text node. Simply loop to the next '<' + /* this is a text node. Simply loop to the next '<' */ while (inputBuffer[currentIndex] != '<') { ++currentIndex; } } - //check what do we have now - char currentChar = inputBuffer[currentIndex]; + /* check what do we have now */ + currentChar = inputBuffer[currentIndex]; if (currentChar == '<') { - //check if that is a closing node + /* check if that is a closing node */ currentChar = inputBuffer[currentIndex+1]; if (currentChar == '/') { - //as we are in a correct XML (so far...), if the node is - //being directly closed, the inline is allowed !!! + /* as we are in a correct XML (so far...), if the node is */ + /* being directly closed, the inline is allowed !!! */ return TRUE; } } - //inline not allowed... + /* inline not allowed... */ return FALSE; } bool isOnSingleLine(int skip, char stop1, char stop2) { - int currentIndex = inputBufferIndex+skip; //skip the n first chars (in comment ' for the alignment with '' for the alignment with '' + xmlPrettyPrintedIndex -= 7; /* remove indentation spaces */ + putCharsInBuffer("--"); /* reset the first chars of '-->' */ } } } - else if (!options->oneLineComment && !inlineAllowed) //oh ! there is a line break + else if (!options->oneLineComment && !inlineAllowed) /* oh ! there is a line break */ { - //if the comments need to be aligned, just add 5 spaces + /* if the comments need to be aligned, just add 5 spaces */ if (options->alignComment) { - int read = readWhites(FALSE); //strip the whites and new line - if (nextChar == '\r' && read == 0 && getNextChar() == '\n') //handles the \r\n return line + int read = readWhites(FALSE); /* strip the whites and new line */ + if (nextChar == '\r' && read == 0 && getNextChar() == '\n') /* handles the \r\n return line */ { readNextChar(); readWhites(FALSE); } - putNewLine(); //put a new indentation line - putCharsInBuffer(" "); //align with ' + xmlPrettyPrintedIndex -= 11; /* remove indentation spaces */ + putCharsInBuffer("]]"); /* reset the first chars of '-->' */ } } } - else if (!options->oneLineCdata && !inlineAllowed) //line break + else if (!options->oneLineCdata && !inlineAllowed) /* line break */ { - //if the cdata need to be aligned, just add 9 spaces + /* if the cdata need to be aligned, just add 9 spaces */ if (options->alignCdata) { - int read = readWhites(FALSE); //strip the whites and new line - if (nextChar == '\r' && read == 0 && getNextChar() == '\n') //handles the \r\n return line + int read = readWhites(FALSE); /* strip the whites and new line */ + if (nextChar == '\r' && read == 0 && getNextChar() == '\n') /* handles the \r\n return line */ { readNextChar(); readWhites(FALSE); } - putNewLine(); //put a new indentation line - putCharsInBuffer(" "); //align with <![CDATA[ - oldChar = ' '; //and update the last char + putNewLine(); /* put a new indentation line */ + putCharsInBuffer(" "); /* align with <![CDATA[ */ + oldChar = ' '; /* and update the last char */ } else { @@ -984,11 +984,11 @@ void processCDATA(void) oldChar = nextChar; } } - else //cdata are inlined + else /* cdata are inlined */ { - readWhites(TRUE); //strip the whites and add a space if necessary + readWhites(TRUE); /* strip the whites and add a space if necessary */ if(getPreviousInsertedChar() != ' ' && - strncmp(xmlPrettyPrinted+xmlPrettyPrintedIndex-9, "<![CDATA[", 9) != 0) //prevents adding a space at the beginning + strncmp(xmlPrettyPrinted+xmlPrettyPrintedIndex-9, "<![CDATA[", 9) != 0) /* prevents adding a space at the beginning */ { putCharInBuffer(' '); oldChar = ' '; @@ -996,10 +996,10 @@ void processCDATA(void) } } - //if the cdata is inline, then all the trailing spaces are removed + /* if the cdata is inline, then all the trailing spaces are removed */ if (options->oneLineCdata) { - xmlPrettyPrintedIndex -= 2; //because of the last ']]' inserted + xmlPrettyPrintedIndex -= 2; /* because of the last ']]' inserted */ while(isWhite(xmlPrettyPrinted[xmlPrettyPrintedIndex-1])) { --xmlPrettyPrintedIndex; @@ -1007,8 +1007,8 @@ void processCDATA(void) putCharsInBuffer("]]"); } - //finalize the cdata - char lastChar = readNextChar(); //should be '>' + /* finalize the cdata */ + lastChar = readNextChar(); /* should be '>' */ if (lastChar != '>') { printError("processCDATA : last char must be '>' (not '%c')", lastChar); @@ -1020,38 +1020,38 @@ void processCDATA(void) if (inlineAllowed) { appendIndentation = FALSE; } - //there was no node open + /* there was no node open */ lastNodeOpen = FALSE; } void processDoctype(void) { - putNextCharsInBuffer(9); //put the '<!DOCTYPE' into the buffer + putNextCharsInBuffer(9); /* put the '<!DOCTYPE' into the buffer */ bool loop = TRUE; while(loop) { readWhites(TRUE); - putCharInBuffer(' '); //only one space for the attributes + putCharInBuffer(' '); /* only one space for the attributes */ int nextChar = readNextChar(); while(!isWhite(nextChar) && - !isQuote(nextChar) && //begins a quoted text - nextChar != '=' && //begins an attribute - nextChar != '>' && //end of doctype - nextChar != '[') //inner <!ELEMENT> types + !isQuote(nextChar) && /* begins a quoted text */ + nextChar != '=' && /* begins an attribute */ + nextChar != '>' && /* end of doctype */ + nextChar != '[') /* inner <!ELEMENT> types */ { putCharInBuffer(nextChar); nextChar = readNextChar(); } - if (isWhite(nextChar)) {} //do nothing, just let the next loop do the job + if (isWhite(nextChar)) {} /* do nothing, just let the next loop do the job */ else if (isQuote(nextChar) || nextChar == '=') { if (nextChar == '=') { putCharInBuffer(nextChar); - nextChar = readNextChar(); //now we should have a quote + nextChar = readNextChar(); /* now we should have a quote */ if (!isQuote(nextChar)) { @@ -1061,7 +1061,7 @@ void processDoctype(void) } } - //simply process the content + /* simply process the content */ char quote = nextChar; do { @@ -1069,14 +1069,14 @@ void processDoctype(void) nextChar = readNextChar(); } while (nextChar != quote); - putCharInBuffer(nextChar); //now the last char is the last quote + putCharInBuffer(nextChar); /* now the last char is the last quote */ } - else if (nextChar == '>') //end of doctype + else if (nextChar == '>') /* end of doctype */ { putCharInBuffer(nextChar); loop = FALSE; } - else //the char is a '[' => not supported yet + else /* the char is a '[' => not supported yet */ { printError("DOCTYPE inner ELEMENT is currently not supported by PrettyPrinter\n"); result = PRETTY_PRINTING_NOT_SUPPORTED_YET; Modified: pretty-printer/src/PrettyPrinter.h 46 files changed, 23 insertions(+), 23 deletions(-) =================================================================== @@ -19,7 +19,7 @@ #ifndef PRETTY_PRINTER_H #define PRETTY_PRINTER_H -//========================================== INCLUDES ========================================================== +/*========================================== INCLUDES ==========================================================*/ #ifdef HAVE_CONFIG_H # include "config.h" @@ -34,7 +34,7 @@ #include <glib.h> #endif -//========================================== DEFINES =========================================================== +/*========================================== DEFINES ===========================================================*/ #define PRETTY_PRINTER_VERSION "1.3" @@ -54,7 +54,7 @@ typedef unsigned int bool; -//========================================== STRUCTURES ======================================================= +/*========================================== STRUCTURES =======================================================*/ /** * The PrettyPrintingOptions struct allows the programmer to tell the @@ -62,29 +62,29 @@ */ typedef struct { - const char* newLineChars; //char used to generate a new line (generally \r\n) - char indentChar; //char used for indentation - int indentLength; //number of char to use for indentation (by default 2 spaces) - bool oneLineText; //text is put on one line - bool inlineText; //if possible text are inline (no return after the opening node and before closing node) - bool oneLineComment; //comments are put on one line - bool inlineComment; //if possible comments are inline (no return after the opening node and before closing node) - bool oneLineCdata; //cdata are put on one line - bool inlineCdata; //if possible cdata are inline (no return after the opening node and before closing node) - bool emptyNodeStripping; //the empty nodes such <node></node> are set to <node/> - bool emptyNodeStrippingSpace; //put a space before the '/>' when a node is stripped - bool forceEmptyNodeSplit; //force an empty node to be splitted : <node /> becomes <node></node> (only if emptyNodeStripping = false) - bool trimLeadingWhites; //trim the leading whites in a text node - bool trimTrailingWhites; //trim the trailing whites in a text node - bool alignComment; //align the comments. If false, comments are untouched (only if oneLineComment = false) - bool alignText; //align the text in a node. If false, text is untouched (only if oneLineText = false) - bool alignCdata; //align the cdata. If false, cdata is untouched (only if oneLineCdata = false) + const char* newLineChars; /* char used to generate a new line (generally \r\n) */ + char indentChar; /* char used for indentation */ + int indentLength; /* number of char to use for indentation (by default 2 spaces) */ + bool oneLineText; /* text is put on one line */ + bool inlineText; /* if possible text are inline (no return after the opening node and before closing node) */ + bool oneLineComment; /* comments are put on one line */ + bool inlineComment; /* if possible comments are inline (no return after the opening node and before closing node) */ + bool oneLineCdata; /* cdata are put on one line */ + bool inlineCdata; /* if possible cdata are inline (no return after the opening node and before closing node) */ + bool emptyNodeStripping; /* the empty nodes such <node></node> are set to <node/> */ + bool emptyNodeStrippingSpace; /* put a space before the '/>' when a node is stripped */ + bool forceEmptyNodeSplit; /* force an empty node to be splitted : <node /> becomes <node></node> (only if emptyNodeStripping = false) */ + bool trimLeadingWhites; /* trim the leading whites in a text node */ + bool trimTrailingWhites; /* trim the trailing whites in a text node */ + bool alignComment; /* align the comments. If false, comments are untouched (only if oneLineComment = false) */ + bool alignText; /* align the text in a node. If false, text is untouched (only if oneLineText = false) */ + bool alignCdata; /* align the cdata. If false, cdata is untouched (only if oneLineCdata = false) */ } PrettyPrintingOptions; -//========================================== FUNCTIONS ========================================================= +/*========================================== FUNCTIONS =========================================================*/ -int processXMLPrettyPrinting(char** xml, int* length, PrettyPrintingOptions* ppOptions); //process the pretty-printing on a valid xml string (no check done !!!). The ppOptions ARE NOT FREE-ED after processing. The method returns 0 if the pretty-printing has been done. -PrettyPrintingOptions* createDefaultPrettyPrintingOptions(void); //creates a default PrettyPrintingOptions object +int processXMLPrettyPrinting(char** xml, int* length, PrettyPrintingOptions* ppOptions); /* process the pretty-printing on a valid xml string (no check done !!!). The ppOptions ARE NOT FREE-ED after processing. The method returns 0 if the pretty-printing has been done. */ +PrettyPrintingOptions* createDefaultPrettyPrintingOptions(void); /* creates a default PrettyPrintingOptions object */ #endif @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits July 2012