Commits April 2019

commits@lists.geany.org

1 participants
43 discussions

[geany/geany] f94a1c: Update of German translation
by Frank Lanitz 28 Apr '19

28 Apr '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 28 Apr 2019 08:46:51 UTC Commit: f94a1c54d5041901fcb54a22285c2d81ed5ba643 https://github.com/geany/geany/commit/f94a1c54d5041901fcb54a22285c2d81ed5ba… Log Message: ----------- Update of German translation Modified Paths: -------------- po/de.po Modified: po/de.po 264 lines changed, 136 insertions(+), 128 deletions(-) =================================================================== @@ -2,16 +2,16 @@ # Copyright (C) 2006 The Geany contributors. # This file is distributed under the same license as the geany package. # Enrico Tröger <enrico.troeger(a)uvena.de> 2006 - 2009 -# Frank Lanitz <frank(a)frank.uvena.de> 2006 - 2018 +# Frank Lanitz <frank(a)frank.uvena.de> 2006 - 2019 # Dominic Hopf <dh(a)dmaphy.de> 2008 - 2009 # # Basic guidelines for this translation: http://wiki.xfce.org/de/translations # msgid "" msgstr "" -"Project-Id-Version: Geany 1.34\n" +"Project-Id-Version: Geany 1.35\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-15 17:13+0200\n" +"POT-Creation-Date: 2019-04-28 10:44+0200\n" "PO-Revision-Date: 2015-03-31 07:10+0200\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" @@ -112,11 +112,11 @@ msgstr "_Suchen" msgid "Open Selected F_ile" msgstr "_Markierte Datei öffnen" -#: ../data/geany.glade.h:19 ../src/symbols.c:2615 +#: ../data/geany.glade.h:19 ../src/symbols.c:2617 msgid "Find _Usage" msgstr "A_uftreten finden" -#: ../data/geany.glade.h:20 ../src/symbols.c:2620 +#: ../data/geany.glade.h:20 ../src/symbols.c:2622 msgid "Find _Document Usage" msgstr "_Auftreten im Dokument finden" @@ -1832,7 +1832,7 @@ msgstr "_Nächstes" msgid "Find _Previous" msgstr "_Vorheriges" -#: ../data/geany.glade.h:381 ../src/symbols.c:2625 +#: ../data/geany.glade.h:381 ../src/symbols.c:2627 msgid "Find in F_iles..." msgstr "In _Dateien suchen…" @@ -2288,69 +2288,69 @@ msgstr "" "Copyright (c) 2005\n" "Die Geany-Contributoren" -#: ../src/about.c:169 +#: ../src/about.c:170 msgid "About Geany" msgstr "Über Geany" -#: ../src/about.c:213 +#: ../src/about.c:214 msgid "A fast and lightweight IDE" msgstr "Eine kleine und schnelle Entwicklungsumgebung" -#: ../src/about.c:235 +#: ../src/about.c:236 #, c-format msgid "(built on or after %s)" msgstr "(kompiliert am %s oder später)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:267 +#: ../src/about.c:268 msgid "Info" msgstr "Info" -#: ../src/about.c:283 +#: ../src/about.c:284 msgid "Developers" msgstr "Entwickler" -#: ../src/about.c:290 +#: ../src/about.c:291 msgid "maintainer" msgstr "Hauptentwickler" -#: ../src/about.c:298 ../src/about.c:306 ../src/about.c:314 +#: ../src/about.c:299 ../src/about.c:307 ../src/about.c:315 msgid "developer" msgstr "Entwickler" -#: ../src/about.c:322 +#: ../src/about.c:323 msgid "translation maintainer" msgstr "Übersetzungskoordinator" -#: ../src/about.c:331 +#: ../src/about.c:332 msgid "Translators" msgstr "Übersetzer" -#: ../src/about.c:351 +#: ../src/about.c:352 msgid "Previous Translators" msgstr "Ehemalige Übersetzer" -#: ../src/about.c:372 +#: ../src/about.c:373 msgid "Contributors" msgstr "Mitwirkende" -#: ../src/about.c:382 +#: ../src/about.c:383 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" "Einige der vielen Leute, die an Geany mitgearbeitet haben (eine " "detailliertere Liste findet sich in der Datei %s):" -#: ../src/about.c:408 +#: ../src/about.c:409 msgid "Credits" msgstr "Credits" -#: ../src/about.c:425 +#: ../src/about.c:426 msgid "License" msgstr "Lizenz" -#: ../src/about.c:434 +#: ../src/about.c:435 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -2466,12 +2466,12 @@ msgstr "Keine weiteren Fehlermeldungen." msgid "Set menu item label" msgstr "Bezeichnung für den Menüeintrag definieren" -#: ../src/build.c:1785 ../src/symbols.c:520 ../src/tools.c:396 +#: ../src/build.c:1785 ../src/symbols.c:522 ../src/tools.c:396 msgid "Label" msgstr "Label" #. command column, holding status and command display -#: ../src/build.c:1786 ../src/symbols.c:515 ../src/tools.c:381 +#: ../src/build.c:1786 ../src/symbols.c:517 ../src/tools.c:381 msgid "Command" msgstr "Kommando" @@ -2747,7 +2747,7 @@ msgstr "" #: ../src/dialogs.c:1204 ../src/dialogs.c:1205 ../src/dialogs.c:1206 #: ../src/dialogs.c:1212 ../src/dialogs.c:1213 ../src/dialogs.c:1214 -#: ../src/symbols.c:2429 ../src/symbols.c:2445 ../src/ui_utils.c:287 +#: ../src/symbols.c:2431 ../src/symbols.c:2447 ../src/ui_utils.c:287 msgid "unknown" msgstr "unbekannt" @@ -3302,7 +3302,7 @@ msgstr "Gehe zu" msgid "View" msgstr "Ansicht" -#: ../src/keybindings.c:321 ../src/symbols.c:641 +#: ../src/keybindings.c:321 ../src/symbols.c:643 msgid "Document" msgstr "Dokument" @@ -3347,7 +3347,7 @@ msgstr "Speichern unter" msgid "Save all" msgstr "Alle speichern" -#: ../src/keybindings.c:350 ../src/symbols.c:725 +#: ../src/keybindings.c:350 ../src/symbols.c:727 msgid "Properties" msgstr "Eigenschaften" @@ -4139,11 +4139,11 @@ msgstr "Tasten festlegen" msgid "Press the combination of the keys you want to use for \"%s\"." msgstr "Welche Tastenkombination soll für »%s« genutzt werden?" -#: ../src/prefs.c:226 ../src/symbols.c:2583 ../src/sidebar.c:751 +#: ../src/prefs.c:226 ../src/symbols.c:2585 ../src/sidebar.c:751 msgid "_Expand All" msgstr "Alle a_usklappen" -#: ../src/prefs.c:231 ../src/symbols.c:2588 ../src/sidebar.c:757 +#: ../src/prefs.c:231 ../src/symbols.c:2590 ../src/sidebar.c:757 msgid "_Collapse All" msgstr "Alle _einklappen" @@ -4705,11 +4705,11 @@ msgstr "Unbekannter Fehler beim Ausführen des Kind-Prozess aufgetreten." msgid "Value" msgstr "Wert" -#: ../src/symbols.c:471 ../src/symbols.c:521 ../src/symbols.c:631 +#: ../src/symbols.c:471 ../src/symbols.c:523 ../src/symbols.c:633 msgid "Chapter" msgstr "Kapitel" -#: ../src/symbols.c:472 ../src/symbols.c:517 ../src/symbols.c:632 +#: ../src/symbols.c:472 ../src/symbols.c:519 ../src/symbols.c:634 msgid "Section" msgstr "Abschnitt" @@ -4729,300 +4729,308 @@ msgstr "Sect3" msgid "Appendix" msgstr "Anhang" -#: ../src/symbols.c:477 ../src/symbols.c:522 ../src/symbols.c:547 -#: ../src/symbols.c:563 ../src/symbols.c:578 ../src/symbols.c:589 -#: ../src/symbols.c:690 ../src/symbols.c:701 ../src/symbols.c:714 -#: ../src/symbols.c:728 ../src/symbols.c:740 ../src/symbols.c:752 -#: ../src/symbols.c:769 ../src/symbols.c:798 ../src/symbols.c:830 +#: ../src/symbols.c:477 ../src/symbols.c:524 ../src/symbols.c:549 +#: ../src/symbols.c:565 ../src/symbols.c:580 ../src/symbols.c:591 +#: ../src/symbols.c:692 ../src/symbols.c:703 ../src/symbols.c:716 +#: ../src/symbols.c:730 ../src/symbols.c:742 ../src/symbols.c:754 +#: ../src/symbols.c:771 ../src/symbols.c:800 ../src/symbols.c:832 msgid "Other" msgstr "Sonstiges" -#: ../src/symbols.c:483 ../src/symbols.c:760 ../src/symbols.c:808 +#: ../src/symbols.c:483 ../src/symbols.c:762 ../src/symbols.c:810 msgid "Module" msgstr "Modul" -#: ../src/symbols.c:484 ../src/symbols.c:574 ../src/symbols.c:686 -#: ../src/symbols.c:738 ../src/symbols.c:750 ../src/symbols.c:765 -#: ../src/symbols.c:779 +#: ../src/symbols.c:484 ../src/symbols.c:576 ../src/symbols.c:688 +#: ../src/symbols.c:740 ../src/symbols.c:752 ../src/symbols.c:767 +#: ../src/symbols.c:781 msgid "Types" msgstr "Typen" #: ../src/symbols.c:485 msgid "Type constructors" msgstr "Typkonstruktoren" -#: ../src/symbols.c:486 ../src/symbols.c:508 ../src/symbols.c:529 -#: ../src/symbols.c:546 ../src/symbols.c:558 ../src/symbols.c:571 -#: ../src/symbols.c:586 ../src/symbols.c:600 ../src/symbols.c:610 -#: ../src/symbols.c:674 ../src/symbols.c:724 ../src/symbols.c:747 -#: ../src/symbols.c:792 ../src/symbols.c:816 +#: ../src/symbols.c:486 ../src/symbols.c:510 ../src/symbols.c:531 +#: ../src/symbols.c:548 ../src/symbols.c:560 ../src/symbols.c:573 +#: ../src/symbols.c:588 ../src/symbols.c:602 ../src/symbols.c:612 +#: ../src/symbols.c:676 ../src/symbols.c:726 ../src/symbols.c:749 +#: ../src/symbols.c:794 ../src/symbols.c:818 msgid "Functions" msgstr "Funktionen" #: ../src/symbols.c:491 msgid "Program" msgstr "Programm" -#: ../src/symbols.c:493 ../src/symbols.c:501 ../src/symbols.c:507 +#: ../src/symbols.c:493 +msgid "Divisions" +msgstr "Bereiche (Divisions)" + +#: ../src/symbols.c:494 ../src/symbols.c:503 ../src/symbols.c:509 msgid "Sections" msgstr "Abschnitte" -#: ../src/symbols.c:494 +#: ../src/symbols.c:495 msgid "Paragraph" msgstr "Absatz" -#: ../src/symbols.c:495 +#: ../src/symbols.c:496 msgid "Group" msgstr "Gruppe" -#: ../src/symbols.c:496 +#: ../src/symbols.c:497 msgid "Data" msgstr "Daten" -#: ../src/symbols.c:502 +#: ../src/symbols.c:498 +msgid "Copies" +msgstr "Kopien (Copies)" + +#: ../src/symbols.c:504 msgid "Keys" msgstr "Indizes" -#: ../src/symbols.c:509 ../src/symbols.c:560 ../src/symbols.c:576 -#: ../src/symbols.c:602 ../src/symbols.c:675 ../src/symbols.c:700 -#: ../src/symbols.c:726 ../src/symbols.c:739 ../src/symbols.c:748 -#: ../src/symbols.c:764 ../src/symbols.c:799 ../src/symbols.c:828 +#: ../src/symbols.c:511 ../src/symbols.c:562 ../src/symbols.c:578 +#: ../src/symbols.c:604 ../src/symbols.c:677 ../src/symbols.c:702 +#: ../src/symbols.c:728 ../src/symbols.c:741 ../src/symbols.c:750 +#: ../src/symbols.c:766 ../src/symbols.c:801 ../src/symbols.c:830 msgid "Variables" msgstr "Variablen" -#: ../src/symbols.c:516 +#: ../src/symbols.c:518 msgid "Environment" msgstr "Umgebung" -#: ../src/symbols.c:518 ../src/symbols.c:633 +#: ../src/symbols.c:520 ../src/symbols.c:635 msgid "Subsection" msgstr "Unterabschnitt" -#: ../src/symbols.c:519 ../src/symbols.c:634 +#: ../src/symbols.c:521 ../src/symbols.c:636 msgid "Subsubsection" msgstr "Unterunterabschnitt" -#: ../src/symbols.c:530 ../src/symbols.c:555 +#: ../src/symbols.c:532 ../src/symbols.c:557 msgid "Structures" msgstr "Strukturen" -#: ../src/symbols.c:537 +#: ../src/symbols.c:539 msgid "Parts" msgstr "Parts" -#: ../src/symbols.c:538 +#: ../src/symbols.c:540 msgid "Assembly" msgstr "Assembly" -#: ../src/symbols.c:539 +#: ../src/symbols.c:541 msgid "Steps" msgstr "Steps" -#: ../src/symbols.c:554 ../src/symbols.c:652 ../src/symbols.c:698 +#: ../src/symbols.c:556 ../src/symbols.c:654 ../src/symbols.c:700 msgid "Modules" msgstr "Module" -#: ../src/symbols.c:556 ../src/symbols.c:603 +#: ../src/symbols.c:558 ../src/symbols.c:605 msgid "Traits" msgstr "Charakteristika" -#: ../src/symbols.c:557 +#: ../src/symbols.c:559 msgid "Implementations" msgstr "Implementierungen" -#: ../src/symbols.c:559 ../src/symbols.c:819 +#: ../src/symbols.c:561 ../src/symbols.c:821 msgid "Typedefs / Enums" msgstr "Typendefinition und Enumerates" -#: ../src/symbols.c:561 ../src/symbols.c:777 ../src/symbols.c:786 -#: ../src/symbols.c:825 +#: ../src/symbols.c:563 ../src/symbols.c:779 ../src/symbols.c:788 +#: ../src/symbols.c:827 msgid "Macros" msgstr "Makros" -#: ../src/symbols.c:562 ../src/symbols.c:655 ../src/symbols.c:664 -#: ../src/symbols.c:673 ../src/symbols.c:711 ../src/symbols.c:737 +#: ../src/symbols.c:564 ../src/symbols.c:657 ../src/symbols.c:666 +#: ../src/symbols.c:675 ../src/symbols.c:713 ../src/symbols.c:739 msgid "Methods" msgstr "Methoden" -#: ../src/symbols.c:570 ../src/symbols.c:585 ../src/symbols.c:683 -#: ../src/symbols.c:708 ../src/symbols.c:721 +#: ../src/symbols.c:572 ../src/symbols.c:587 ../src/symbols.c:685 +#: ../src/symbols.c:710 ../src/symbols.c:723 msgid "Package" msgstr "Package" -#: ../src/symbols.c:572 ../src/symbols.c:598 ../src/symbols.c:709 -#: ../src/symbols.c:722 ../src/symbols.c:735 ../src/symbols.c:762 -#: ../src/symbols.c:815 +#: ../src/symbols.c:574 ../src/symbols.c:600 ../src/symbols.c:711 +#: ../src/symbols.c:724 ../src/symbols.c:737 ../src/symbols.c:764 +#: ../src/symbols.c:817 msgid "Interfaces" msgstr "Interfaces" -#: ../src/symbols.c:573 ../src/symbols.c:818 +#: ../src/symbols.c:575 ../src/symbols.c:820 msgid "Structs" msgstr "Strukturen" -#: ../src/symbols.c:575 ../src/symbols.c:588 ../src/symbols.c:601 -#: ../src/symbols.c:727 ../src/symbols.c:749 +#: ../src/symbols.c:577 ../src/symbols.c:590 ../src/symbols.c:603 +#: ../src/symbols.c:729 ../src/symbols.c:751 msgid "Constants" msgstr "Konstanten" -#: ../src/symbols.c:577 ../src/symbols.c:712 ../src/symbols.c:817 +#: ../src/symbols.c:579 ../src/symbols.c:714 ../src/symbols.c:819 msgid "Members" msgstr "Instanzvariablen" -#: ../src/symbols.c:587 ../src/symbols.c:751 ../src/symbols.c:776 +#: ../src/symbols.c:589 ../src/symbols.c:753 ../src/symbols.c:778 msgid "Labels" msgstr "Label" -#: ../src/symbols.c:597 ../src/symbols.c:662 ../src/symbols.c:811 +#: ../src/symbols.c:599 ../src/symbols.c:664 ../src/symbols.c:813 msgid "Namespaces" msgstr "Namensräume" -#: ../src/symbols.c:599 ../src/symbols.c:621 ../src/symbols.c:653 -#: ../src/symbols.c:663 ../src/symbols.c:672 ../src/symbols.c:710 -#: ../src/symbols.c:723 ../src/symbols.c:736 ../src/symbols.c:814 +#: ../src/symbols.c:601 ../src/symbols.c:623 ../src/symbols.c:655 +#: ../src/symbols.c:665 ../src/symbols.c:674 ../src/symbols.c:712 +#: ../src/symbols.c:725 ../src/symbols.c:738 ../src/symbols.c:816 msgid "Classes" msgstr "Klassen" -#: ../src/symbols.c:611 +#: ../src/symbols.c:613 msgid "Anchors" msgstr "Anker" -#: ../src/symbols.c:612 +#: ../src/symbols.c:614 msgid "H1 Headings" msgstr "Überschrift (H1)" -#: ../src/symbols.c:613 +#: ../src/symbols.c:615 msgid "H2 Headings" msgstr "Überschrift (H2)" -#: ../src/symbols.c:614 +#: ../src/symbols.c:616 msgid "H3 Headings" msgstr "Überschrift (H3)" -#: ../src/symbols.c:622 +#: ../src/symbols.c:624 msgid "ID Selectors" msgstr "ID" -#: ../src/symbols.c:623 +#: ../src/symbols.c:625 msgid "Type Selectors" msgstr "Typ" -#: ../src/symbols.c:642 +#: ../src/symbols.c:644 msgid "Section Level 1" msgstr "Überschrift Ebene 1" -#: ../src/symbols.c:643 +#: ../src/symbols.c:645 msgid "Section Level 2" msgstr "Überschrift Ebene 2" -#: ../src/symbols.c:644 +#: ../src/symbols.c:646 msgid "Section Level 3" msgstr "Überschrift Ebene 3" -#: ../src/symbols.c:645 +#: ../src/symbols.c:647 msgid "Section Level 4" msgstr "Überschrift Ebene 4" -#: ../src/symbols.c:654 +#: ../src/symbols.c:656 msgid "Singletons" msgstr "Singletons" -#: ../src/symbols.c:665 ../src/symbols.c:793 +#: ../src/symbols.c:667 ../src/symbols.c:795 msgid "Procedures" msgstr "Prozeduren" -#: ../src/symbols.c:676 +#: ../src/symbols.c:678 msgid "Imports" msgstr "Importe" -#: ../src/symbols.c:684 +#: ../src/symbols.c:686 msgid "Entities" msgstr "Entitäten" -#: ../src/symbols.c:685 +#: ../src/symbols.c:687 msgid "Architectures" msgstr "Architekturen" -#: ../src/symbols.c:687 +#: ../src/symbols.c:689 msgid "Functions / Procedures" msgstr "Funktionen/Prozeduren" -#: ../src/symbols.c:688 +#: ../src/symbols.c:690 msgid "Variables / Signals" msgstr "Variablen/Signale" -#: ../src/symbols.c:689 +#: ../src/symbols.c:691 msgid "Processes / Blocks / Components" msgstr "Prozesse/Blöcke/Komponenten" -#: ../src/symbols.c:697 +#: ../src/symbols.c:699 msgid "Events" msgstr "Ereignisse" -#: ../src/symbols.c:699 +#: ../src/symbols.c:701 msgid "Functions / Tasks" msgstr "Funktionen" -#: ../src/symbols.c:713 ../src/symbols.c:768 +#: ../src/symbols.c:715 ../src/symbols.c:770 msgid "Enums" msgstr "Enums" -#: ../src/symbols.c:761 +#: ../src/symbols.c:763 msgid "Programs" msgstr "Programme" -#: ../src/symbols.c:763 +#: ../src/symbols.c:765 msgid "Functions / Subroutines" msgstr "Funktionen/Prozeduren" -#: ../src/symbols.c:766 +#: ../src/symbols.c:768 msgid "Components" msgstr "Komponenten" -#: ../src/symbols.c:767 +#: ../src/symbols.c:769 msgid "Blocks" msgstr "Blöcke" -#: ../src/symbols.c:778 +#: ../src/symbols.c:780 msgid "Defines" msgstr "Definitionen" -#: ../src/symbols.c:785 +#: ../src/symbols.c:787 msgid "Targets" msgstr "Targets" -#: ../src/symbols.c:794 +#: ../src/symbols.c:796 msgid "Indexes" msgstr "Indizies" -#: ../src/symbols.c:795 +#: ../src/symbols.c:797 msgid "Tables" msgstr "Tabellen" -#: ../src/symbols.c:796 +#: ../src/symbols.c:798 msgid "Triggers" msgstr "Trigger" -#: ../src/symbols.c:797 +#: ../src/symbols.c:799 msgid "Views" msgstr "Ansichten" -#: ../src/symbols.c:829 +#: ../src/symbols.c:831 msgid "Extern Variables" msgstr "Externe Variablen" -#: ../src/symbols.c:1646 +#: ../src/symbols.c:1648 #, c-format msgid "Unknown filetype extension for \"%s\".\n" msgstr "Unbekannte Dateierweiterung für »%s«.\n" -#: ../src/symbols.c:1672 +#: ../src/symbols.c:1674 #, c-format msgid "Failed to create tags file, perhaps because no symbols were found.\n" msgstr "" "Die Tag-Datei konnte nicht erstellt werden -- Möglicherweise konnten keine " "Symbole gefunden werden.\n" -#: ../src/symbols.c:1679 +#: ../src/symbols.c:1681 #, c-format msgid "" "Usage: %s -g <Tags File> <File list>\n" @@ -5031,7 +5039,7 @@ msgstr "" "Verwendung: %s -g <Tag-Datei> <Datei-Liste>\n" "\n" -#: ../src/symbols.c:1680 +#: ../src/symbols.c:1682 #, c-format msgid "" "Example:\n" @@ -5042,52 +5050,52 @@ msgstr "" "CFLAGS=`pkg-config gtk+-2.0 --cflags` %s -g gtk2.c.tags /usr/include/gtk-2.0/" "gtk/gtk.h\n" -#: ../src/symbols.c:1694 +#: ../src/symbols.c:1696 msgid "Load Tags File" msgstr "Tag-Datei laden" -#: ../src/symbols.c:1701 +#: ../src/symbols.c:1703 msgid "Geany tags file (*.*.tags)" msgstr "Geany Tag-Datei (*.*.tags)" #. For translators: the first wildcard is the filetype, the second the filename -#: ../src/symbols.c:1721 +#: ../src/symbols.c:1723 #, c-format msgid "Loaded %s tags file '%s'." msgstr "%s Tag-Datei »%s« geladen." -#: ../src/symbols.c:1724 +#: ../src/symbols.c:1726 #, c-format msgid "Could not load tags file '%s'." msgstr "Konnte Tag-Datei »%s« nicht laden." #. For translators: it's the filename and line number of a symbol in the goto-symbol popup menu -#: ../src/symbols.c:1967 +#: ../src/symbols.c:1969 #, c-format msgid "%s: %lu" msgstr "%s: %lu" #. For translators: it's the filename and line number of a symbol in the goto-symbol popup menu -#: ../src/symbols.c:1970 +#: ../src/symbols.c:1972 #, c-format msgid "%s: %lu" msgstr "%s: %lu" -#: ../src/symbols.c:2180 +#: ../src/symbols.c:2182 #, c-format msgid "Forward declaration \"%s\" not found." msgstr "(Vorwärts-)Deklaration von »%s« nicht gefunden." -#: ../src/symbols.c:2182 +#: ../src/symbols.c:2184 #, c-format msgid "Definition of \"%s\" not found." msgstr "Definition von »%s« nicht gefunden." -#: ../src/symbols.c:2598 +#: ../src/symbols.c:2600 msgid "Sort by _Name" msgstr "Nach _Namen sortieren" -#: ../src/symbols.c:2605 +#: ../src/symbols.c:2607 msgid "Sort by _Appearance" msgstr "Nach _Auftreten sortieren" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] f6b044: Don't perform line breaking in rectangular selection mode (#2135)
by Colomban Wendling 28 Apr '19

28 Apr '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: elextr <elextr(a)gmail.com> Date: Sat, 27 Apr 2019 23:37:18 UTC Commit: f6b04480c8b09942da11f4e59f542eddf881ef81 https://github.com/geany/geany/commit/f6b04480c8b09942da11f4e59f542eddf881e… Log Message: ----------- Don't perform line breaking in rectangular selection mode (#2135) Doing so drops the rectangular selection, and there is no obvious correct behavior for line breaking with a rectangular selection. So, just don't do line breaking in this case. Fixes #2051. Modified Paths: -------------- src/editor.c Modified: src/editor.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -540,7 +540,7 @@ static void check_line_breaking(GeanyEditor *editor, gint pos) gint line, lstart, col; gchar c; - if (!editor->line_breaking) + if (!editor->line_breaking || sci_get_selection_mode(editor->sci) != SC_SEL_STREAM) return; col = sci_get_col_from_position(sci, pos); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d55176: scintilla: Fix invalid memory access in MoveSelectedLines
by Colomban Wendling 27 Apr '19

27 Apr '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 27 Apr 2019 14:12:50 UTC Commit: d551765d59f0f92d5ffa68dba3f541f4c00c2c12 https://github.com/geany/geany/commit/d551765d59f0f92d5ffa68dba3f541f4c00c2… Log Message: ----------- scintilla: Fix invalid memory access in MoveSelectedLines Fixes #2066. X-Scintilla-Commit-ID: df5c32512d3d6b71ee6138c709b392258c3a1991, 25a0367e9349c8475c619a054af7bf1daf15b04c X-Scintilla-Bug-ID: https://sourceforge.net/p/scintilla/bugs/2078/ Modified Paths: -------------- scintilla/src/Editor.cxx Modified: scintilla/src/Editor.cxx 7 lines changed, 5 insertions(+), 2 deletions(-) =================================================================== @@ -1003,6 +1003,10 @@ void Editor::VerticalCentreCaret() { void Editor::MoveSelectedLines(int lineDelta) { + if (sel.IsRectangular()) { + return; + } + // if selection doesn't start at the beginning of the line, set the new start Sci::Position selectionStart = SelectionStart().Position(); const Sci::Line startLine = pdoc->SciLineFromPosition(selectionStart); @@ -1042,7 +1046,6 @@ void Editor::MoveSelectedLines(int lineDelta) { SelectionText selectedText; CopySelectionRange(&selectedText); - Sci::Position selectionLength = SelectionRange(selectionStart, selectionEnd).Length(); const Point currentLocation = LocationFromPosition(CurrentPosition()); const Sci::Line currentLine = LineFromLocation(currentLocation); @@ -1055,7 +1058,7 @@ void Editor::MoveSelectedLines(int lineDelta) { pdoc->InsertString(pdoc->Length(), eol, strlen(eol)); GoToLine(currentLine + lineDelta); - selectionLength = pdoc->InsertString(CurrentPosition(), selectedText.Data(), selectionLength); + Sci::Position selectionLength = pdoc->InsertString(CurrentPosition(), selectedText.Data(), selectedText.Length()); if (appendEol) { const Sci::Position lengthInserted = pdoc->InsertString(CurrentPosition() + selectionLength, eol, strlen(eol)); selectionLength += lengthInserted; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 44c26a: Merge pull request #2128 from b4n/ctags/new-cobol-parser
by Colomban Wendling 27 Apr '19

27 Apr '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 27 Apr 2019 13:21:36 UTC Commit: 44c26adbc35a6f5e3b6d84945b78634d7550e86b https://github.com/geany/geany/commit/44c26adbc35a6f5e3b6d84945b78634d7550e… Log Message: ----------- Merge pull request #2128 from b4n/ctags/new-cobol-parser COBOL: Import new upstream candidate parser Modified Paths: -------------- ctags/parsers/cobol.c src/symbols.c src/tagmanager/tm_parser.c tests/ctags/Makefile.am tests/ctags/cobol/helloworld.cbl tests/ctags/cobol/helloworld.cbl.tags tests/ctags/cobol/helloworld2.cbl tests/ctags/cobol/helloworld2.cbl.tags tests/ctags/cobol/levels.cbl tests/ctags/cobol/levels.cbl.tags tests/ctags/cobol/quoted-program-id.cbl tests/ctags/cobol/quoted-program-id.cbl.tags tests/ctags/cobol/simple.cbl tests/ctags/cobol/simple.cbl.tags tests/ctags/simple.cbl.tags Modified: ctags/parsers/cobol.c 520 lines changed, 497 insertions(+), 23 deletions(-) =================================================================== @@ -8,42 +8,516 @@ * files. */ +/* Some references: + * - https://www.cs.vu.nl/grammarware/browsable/cobol/ + * - https://www.cs.vu.nl/grammarware/browsable/vs-cobol-ii/ + * - https://open-cobol.sourceforge.io/guides/grammar.pdf + * - http://mapage.noos.fr/~bpinon/a_cobol_parser.htm + * - https://en.wikipedia.org/wiki/COBOL + */ + /* * INCLUDE FILES */ #include "general.h" /* must always come first */ +#include "debug.h" +#include "entry.h" +#include "keyword.h" +#include "nestlevel.h" #include "parse.h" +#include "read.h" #include "routines.h" -static tagRegexTable cobolTagRegexTable[] = { - {"^[ \t]*[0-9]+[ \t]+([A-Z0-9][A-Z0-9-]*)[ \t]+(" - "BLANK|OCCURS|IS|JUST|PIC|REDEFINES|RENAMES|SIGN|SYNC|USAGE|VALUE" - ")", "\\1", - "d,data,data items", "i", NULL}, - {"^[ \t]*[FSR]D[ \t]+([A-Z0-9][A-Z0-9-]*)\\.", "\\1", - "f,file,file descriptions (FD, SD, RD)", "i", NULL}, - {"^[ \t]*[0-9]+[ \t]+([A-Z0-9][A-Z0-9-]*)\\.", "\\1", - "g,group,group items", "i", NULL}, - {"^[ \t]*([A-Z0-9][A-Z0-9-]*)\\.", "\\1", - "p,paragraph,paragraphs", "i", NULL}, - {"^[ \t]*PROGRAM-ID\\.[ \t]+([A-Z0-9][A-Z0-9-]*)\\.", "\\1", - "P,program,program ids", "i", NULL}, - {"^[ \t]*([A-Z0-9][A-Z0-9-]*)[ \t]+SECTION\\.", "\\1", - "s,section,sections", "i", NULL}, +typedef enum { + K_FILE, + K_GROUP, + K_PROGRAM, + K_SECTION, + K_DIVISION, + K_PARAGRAPH, + K_DATA, + K_SOURCEFILE, +} cobolKind; + +typedef enum { + COBOL_SOURCEFILE_COPIED, +} cobolSourcefileRole; + +static roleDefinition CobolSourcefileRoles [] = { + { true, "copied", "copied in source file" }, }; -/* -* FUNCTION DEFINITIONS -*/ +static kindDefinition CobolKinds[] = { + { true, 'f', "fd", "file descriptions (FD, SD, RD)" }, + { true, 'g', "group", "group items" }, + { true, 'P', "program", "program ids" }, + { true, 's', "section", "sections" }, + { true, 'D', "division", "divisions" }, + { true, 'p', "paragraph", "paragraphs" }, + { true, 'd', "data", "data items" }, + { true, 'S', "sourcefile", "source code file", + .referenceOnly = true, ATTACH_ROLES(CobolSourcefileRoles)}, +}; + +static langType Lang_cobol; + +enum { + KEYWORD_FD, + KEYWORD_SD, + KEYWORD_RD, + KEYWORD_SECTION, + KEYWORD_DIVISION, + KEYWORD_CONTINUE, + KEYWORD_END_EXEC, + KEYWORD_FILLER, + KEYWORD_BLANK, + KEYWORD_OCCURS, + KEYWORD_IS, + KEYWORD_JUST, + KEYWORD_PIC, + KEYWORD_REDEFINES, + KEYWORD_RENAMES, + KEYWORD_SIGN, + KEYWORD_SYNC, + KEYWORD_USAGE, + KEYWORD_VALUE, + KEYWORD_PROGRAM_ID, + KEYWORD_EXIT, + KEYWORD_COPY, +}; + +static const keywordTable cobolKeywordTable[] = { +#define DEFINE_KEYWORD(n) { #n, KEYWORD_##n } + DEFINE_KEYWORD (FD), + DEFINE_KEYWORD (SD), + DEFINE_KEYWORD (RD), + DEFINE_KEYWORD (SECTION), + DEFINE_KEYWORD (DIVISION), + DEFINE_KEYWORD (CONTINUE), + { "END-EXEC", KEYWORD_END_EXEC }, + DEFINE_KEYWORD (EXIT), + DEFINE_KEYWORD (FILLER), + DEFINE_KEYWORD (BLANK), + DEFINE_KEYWORD (OCCURS), + DEFINE_KEYWORD (IS), + DEFINE_KEYWORD (JUST), + DEFINE_KEYWORD (PIC), + { "PICTURE", KEYWORD_PIC }, + DEFINE_KEYWORD (REDEFINES), + DEFINE_KEYWORD (RENAMES), + DEFINE_KEYWORD (SIGN), + DEFINE_KEYWORD (SYNC), + DEFINE_KEYWORD (USAGE), + DEFINE_KEYWORD (VALUE), + { "VALUES", KEYWORD_VALUE }, + { "PROGRAM-ID", KEYWORD_PROGRAM_ID }, + DEFINE_KEYWORD (COPY), +}; + +#define INDICATOR_COLUMN 7 +#define PROGRAM_NAME_AREA_COLUMN 73 + +#define isIdentifierChar(c) (isalnum(c) || (c) == '-') +#define isQuote(c) ((c) == '\'' || (c) == '"') + +typedef enum { + /* Fixed: program starts at column 8, ends at column 72 */ + FORMAT_FIXED = 0x1, + /* Free: program starts at column 1, no specific end */ + FORMAT_FREE = 0x2, + /* Variable: program starts at column 8, no specific end */ + FORMAT_VARIABLE = FORMAT_FIXED | FORMAT_FREE +} CobolFormat; + +static struct { + vString *line; + unsigned long int lineNumber; + MIOPos filePosition; + const char *nextLine; + CobolFormat format; +} CblInputState; + +static void cblppInit (const CobolFormat format) +{ + CblInputState.line = vStringNew (); + CblInputState.lineNumber = 0; + CblInputState.nextLine = NULL; + CblInputState.format = format; +} + +static void cblppDeinit (void) +{ + vStringDelete (CblInputState.line); +} + +static const char *cblppGetColumn (const char *line, + const unsigned int column) +{ + unsigned int col = 0; + + for (; *line; line++) + { + col += (*line == '\t') ? 8 : 1; + if (col >= column) + return line; + } + + return NULL; +} + +static void cblppAppendLine (vString *buffer, + const char *line) +{ + if (CblInputState.format & FORMAT_FIXED) + { + const char *indicator = cblppGetColumn (line, INDICATOR_COLUMN); + + if (indicator && *indicator && *indicator != '*' && *indicator != '/') + { + const char *lineStart = indicator + 1; + const char *lineEnd = cblppGetColumn (line, PROGRAM_NAME_AREA_COLUMN); + + if (*indicator == '-') + { + vStringStripTrailing (buffer); + while (isspace (*lineStart)) + lineStart++; + } + + if (CblInputState.format == FORMAT_FIXED) + vStringNCatS (buffer, lineStart, lineEnd - lineStart); + else + vStringCatS (buffer, lineStart); + } + } + else if (line[0] != '*' && line[0] != '/') + vStringCatS (buffer, line); +} + +/* TODO: skip *> comments */ +static const char *cblppGetLine (void) +{ + const char *line; + + if (CblInputState.nextLine) + { + line = CblInputState.nextLine; + CblInputState.nextLine = NULL; + } + else + line = (const char *) readLineFromInputFile (); + + CblInputState.lineNumber = getInputLineNumber (); + CblInputState.filePosition = getInputFilePosition (); + + if (!line) + return NULL; + + vStringClear (CblInputState.line); + cblppAppendLine (CblInputState.line, line); + + /* check for continuation lines */ + if (CblInputState.format & FORMAT_FIXED) + { + while (true) + { + const char *indicator; + line = (const char *) readLineFromInputFile (); + if (! line) + break; + indicator = cblppGetColumn (line, INDICATOR_COLUMN); + if (indicator && *indicator == '-') + cblppAppendLine (CblInputState.line, line); + else + break; + } + + CblInputState.nextLine = line; + } + + return vStringValue (CblInputState.line); +} + +static void initCOBOLRefTagEntry (tagEntryInfo *e, const char *name, + const cobolKind kind, const int role) +{ + initRefTagEntry (e, name, kind, role); + e->lineNumber = CblInputState.lineNumber; + e->filePosition = CblInputState.filePosition; +} + +static void initCOBOLTagEntry (tagEntryInfo *e, const char *name, const cobolKind kind) +{ + initCOBOLRefTagEntry (e, name, kind, ROLE_INDEX_DEFINITION); +} + +static int makeCOBOLRefTag (const char *name, const cobolKind kind, const int role) +{ + if (CobolKinds[kind].enabled) + { + tagEntryInfo e; + + initCOBOLRefTagEntry (&e, name, kind, role); + + return makeTagEntry (&e); + } + + return CORK_NIL; +} + +static int makeCOBOLTag (const char *name, const cobolKind kind) +{ + return makeCOBOLRefTag (name, kind, ROLE_INDEX_DEFINITION); +} + +#define CBL_NL(nl) (*((unsigned int *) (nestingLevelGetUserData (nl)))) + +static NestingLevel *popNestingLevelsToLevelNumber (NestingLevels *levels, const unsigned int levelNumber) +{ + NestingLevel *nl; + + while (true) + { + nl = nestingLevelsGetCurrent (levels); + if (! nl || CBL_NL (nl) < levelNumber) + break; + nestingLevelsPop (levels); + } + + return nl; +} + +static bool isNumeric (const char *nptr, unsigned long int *num) +{ + char *endptr; + unsigned long int v; + + v = strtoul (nptr, &endptr, 10); + if (nptr != endptr && *endptr == 0) + { + if (num) + *num = v; + return true; + } + return false; +} + +static void findCOBOLTags (const CobolFormat format) +{ + NestingLevels *levels; + const char *line; + + cblppInit (format); + + levels = nestingLevelsNew (sizeof (unsigned int)); + + while ((line = cblppGetLine ()) != NULL) + { + char word[64]; + int keyword; + unsigned long int levelNumber; + +#define READ_WHILE(word, cond) \ + do { \ + unsigned int i; \ + for (i = 0; i < (ARRAY_SIZE (word) - 1) && *line && (cond); line++) \ + word[i++] = *line; \ + word[i] = 0; \ + } while (0) +#define READ_LITERAL(word) \ + do { \ + const char READ_LITERAL__q = isQuote (*line) ? *line++ : 0; \ + READ_WHILE (word, (READ_LITERAL__q && READ_LITERAL__q != *line) || \ + isIdentifierChar (*line)); \ + if (READ_LITERAL__q && READ_LITERAL__q == *line) \ + line++; \ + keyword = lookupCaseKeyword (word, Lang_cobol); \ + } while (0) +#define READ_WORD(word, keyword) \ + do { \ + READ_WHILE (word, isIdentifierChar (*line)); \ + keyword = lookupCaseKeyword (word, Lang_cobol); \ + } while (0) +#define READ_KEYWORD(keyword) \ + do { \ + char READ_KEYWORD__word[64]; \ + READ_WORD (READ_KEYWORD__word, keyword); \ + } while (0) +#define SKIP_SPACES() do { while (isspace (*line)) line++; } while (0) + + SKIP_SPACES (); + READ_WORD (word, keyword); + SKIP_SPACES (); + + switch (keyword) + { + case KEYWORD_FD: + case KEYWORD_SD: + case KEYWORD_RD: + READ_WORD (word, keyword); + SKIP_SPACES (); + if (*word && *line == '.') + makeCOBOLTag (word, K_FILE); + break; + + case KEYWORD_PROGRAM_ID: + if (*line == '.') + { + line++; + SKIP_SPACES (); + } + READ_LITERAL (word); + if (*word) + makeCOBOLTag (word, K_PROGRAM); + break; + + case KEYWORD_COPY: + READ_WORD (word, keyword); // FIXME: also allow LITERAL + if (*word) + makeCOBOLRefTag (word, K_SOURCEFILE, COBOL_SOURCEFILE_COPIED); + break; + + case KEYWORD_CONTINUE: + case KEYWORD_END_EXEC: + case KEYWORD_EXIT: + case KEYWORD_FILLER: + /* nothing, just ignore those in following cases */; + break; + + default: + if (isNumeric (word, &levelNumber)) + { + READ_WORD (word, keyword); + SKIP_SPACES (); + + if (*word && keyword != KEYWORD_FILLER) + { + int kind = KIND_GHOST_INDEX; + + if (*line == '.') + kind = K_GROUP; + else + { + int keyword2; + + READ_KEYWORD (keyword2); + switch (keyword2) + { + case KEYWORD_BLANK: + case KEYWORD_OCCURS: + case KEYWORD_IS: + case KEYWORD_JUST: + case KEYWORD_PIC: + case KEYWORD_REDEFINES: + case KEYWORD_RENAMES: + case KEYWORD_SIGN: + case KEYWORD_SYNC: + case KEYWORD_USAGE: + case KEYWORD_VALUE: + kind = K_DATA; + } + } + + if (kind != KIND_GHOST_INDEX) + { + NestingLevel *nl; + tagEntryInfo entry; + int r; + unsigned int nestingLevelNumber; + + /* for nesting purposes, level 77 is identical to 1, + * and 66 to 2 */ + switch (levelNumber) + { + default: nestingLevelNumber = levelNumber; break; + case 77: nestingLevelNumber = 1; break; + case 66: nestingLevelNumber = 2; break; + } + + nl = popNestingLevelsToLevelNumber (levels, nestingLevelNumber); + initCOBOLTagEntry (&entry, word, kind); + if (nl && CBL_NL (nl) < nestingLevelNumber) + entry.extensionFields.scopeIndex = nl->corkIndex; + r = makeTagEntry (&entry); + if (levelNumber < 50 /* exclude special levels */) + { + nl = nestingLevelsPush (levels, r); + CBL_NL (nl) = levelNumber; + } + } + } + } + else if (*word && *line == '.') + makeCOBOLTag (word, K_PARAGRAPH); + else + { + int keyword2; + + READ_KEYWORD (keyword2); + SKIP_SPACES (); + + if (keyword2 == KEYWORD_DIVISION && *line == '.') + makeCOBOLTag (word, K_DIVISION); + else if (keyword2 == KEYWORD_SECTION && *line == '.') + makeCOBOLTag (word, K_SECTION); + } + } + } + + nestingLevelsFree (levels); + cblppDeinit (); +} + +static void findCOBOLFixedTags (void) +{ + findCOBOLTags (FORMAT_FIXED); +} + +static void findCOBOLFreeTags (void) +{ + findCOBOLTags (FORMAT_FREE); +} + +static void findCOBOLVariableTags (void) +{ + findCOBOLTags (FORMAT_VARIABLE); +} + +static void initializeCobolParser (langType language) +{ + Lang_cobol = language; +} + +static parserDefinition* commonCobolParserDefinition (const char *name, + simpleParser parser) +{ + parserDefinition* def = parserNew (name); + def->initialize = initializeCobolParser; + def->parser = parser; + def->kindTable = CobolKinds; + def->kindCount = ARRAY_SIZE(CobolKinds); + def->keywordTable = cobolKeywordTable; + def->keywordCount = ARRAY_SIZE(cobolKeywordTable); + def->useCork = true; + return def; +} extern parserDefinition* CobolParser (void) { static const char *const extensions [] = { - "cbl", "cob", "cpy", "CBL", "COB", NULL }; - parserDefinition* def = parserNew ("Cobol"); + "cbl", "cob", "CBL", "COB", NULL }; + parserDefinition* def = commonCobolParserDefinition ("Cobol", + findCOBOLFixedTags); def->extensions = extensions; - def->tagRegexTable = cobolTagRegexTable; - def->tagRegexCount = ARRAY_SIZE (cobolTagRegexTable); - def->method = METHOD_NOT_CRAFTED|METHOD_REGEX; return def; } + +extern parserDefinition* CobolFreeParser (void) +{ + return commonCobolParserDefinition ("CobolFree", findCOBOLFreeTags); +} + +extern parserDefinition* CobolVariableParser (void) +{ + return commonCobolParserDefinition ("CobolVariable", findCOBOLVariableTags); +} Modified: src/symbols.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -490,10 +490,12 @@ static void add_top_level_items(GeanyDocument *doc) tag_list_add_groups(tag_store, &tv_iters.tag_class, _("Program"), ICON_CLASS, &tv_iters.tag_function, _("File"), ICON_METHOD, + &tv_iters.tag_interface, _("Divisions"), ICON_NAMESPACE, &tv_iters.tag_namespace, _("Sections"), ICON_NAMESPACE, &tv_iters.tag_macro, _("Paragraph"), ICON_OTHER, &tv_iters.tag_struct, _("Group"), ICON_STRUCT, &tv_iters.tag_variable, _("Data"), ICON_VAR, + &tv_iters.tag_externvar, _("Copies"), ICON_NAMESPACE, NULL); break; case GEANY_FILETYPES_CONF: Modified: src/tagmanager/tm_parser.c 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -423,11 +423,13 @@ static TMParserMapEntry map_R[] = { static TMParserMapEntry map_COBOL[] = { {'d', tm_tag_variable_t}, + {'D', tm_tag_interface_t}, {'f', tm_tag_function_t}, {'g', tm_tag_struct_t}, {'p', tm_tag_macro_t}, {'P', tm_tag_class_t}, {'s', tm_tag_namespace_t}, + {'S', tm_tag_externvar_t}, }; static TMParserMapEntry map_OBJC[] = { @@ -768,6 +770,7 @@ gboolean tm_parser_has_full_context(TMParserType lang) case TM_PARSER_C: case TM_PARSER_CPP: case TM_PARSER_CSHARP: + case TM_PARSER_COBOL: case TM_PARSER_D: case TM_PARSER_FERITE: case TM_PARSER_GLSL: Modified: tests/ctags/Makefile.am 8 lines changed, 5 insertions(+), 3 deletions(-) =================================================================== @@ -1,9 +1,6 @@ dist_check_SCRIPTS = runner.sh -# Disabled tests: -# simple.cbl - NULL = test_sources = \ 1795612.js \ @@ -117,6 +114,11 @@ test_sources = \ case_sensitivity.php \ char-selector.f90 \ classes.php \ + cobol/helloworld.cbl \ + cobol/helloworld2.cbl \ + cobol/levels.cbl \ + cobol/quoted-program-id.cbl \ + cobol/simple.cbl \ common.f \ complex-return.js \ continuation.f90 \ Modified: tests/ctags/cobol/helloworld.cbl 14 lines changed, 14 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,14 @@ + 00000* VALIDATION OF BASE COBOL INSTALL 00050000 + 01000 IDENTIFICATION DIVISION. 00060000 + 01100 PROGRAM-ID. 'HELLO'. 00070000 + 02000 ENVIRONMENT DIVISION. 00080000 + 02100 CONFIGURATION SECTION. 00090000 + 02110 SOURCE-COMPUTER. GNULINUX. 00100000 + 02120 OBJECT-COMPUTER. HERCULES. 00110000 + 02200 SPECIAL-NAMES. 00120000 + 02210 CONSOLE IS CONSL. 00130000 + 03000 DATA DIVISION. 00140000 + 04000 PROCEDURE DIVISION. 00150000 + 04100 00-MAIN. 00160000 + 04110 DISPLAY 'HELLO, WORLD' UPON CONSL. 00170000 + 04900 STOP RUN. 00180000 Modified: tests/ctags/cobol/helloworld.cbl.tags 11 lines changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,11 @@ +# format=tagmanager +00-MAIN�65536�0 +CONFIGURATION�256�0 +DATA�32�0 +ENVIRONMENT�32�0 +HELLO�1�0 +IDENTIFICATION�32�0 +OBJECT-COMPUTER�65536�0 +PROCEDURE�32�0 +SOURCE-COMPUTER�65536�0 +SPECIAL-NAMES�65536�0 Modified: tests/ctags/cobol/helloworld2.cbl 19 lines changed, 19 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,19 @@ + 00000* VALIDATION OF BASE COBOL INSTALL + IDENTIFICATION DIVISION. + 01100 PROGRAM-ID. 'HELLO WORLD'. + 02000 ENVIRONMENT DIV + -ISION. + 02100 CONFIGURATION SECTION. + 02110 SOURCE-COMPUTER. GNULINUX. + 02120 OBJECT-COMPUTER. HERCULES. + 02200 SPECIAL + --NAMES. + 02210 CONSOLE IS CONSL. + 03000 DATA DIVISION. + 04000 PROCEDUR + - E DIVISION. + 04100 00-MAIN. + 04110 DISPLAY + 'HELLO, WORLD' + UPON CONSL. + 04900 STOP RUN. Modified: tests/ctags/cobol/helloworld2.cbl.tags 11 lines changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,11 @@ +# format=tagmanager +00-MAIN�65536�0 +CONFIGURATION�256�0 +DATA�32�0 +ENVIRONMENT�32�0 +HELLO WORLD�1�0 +IDENTIFICATION�32�0 +OBJECT-COMPUTER�65536�0 +PROCEDURE�32�0 +SOURCE-COMPUTER�65536�0 +SPECIAL-NAMES�65536�0 Modified: tests/ctags/cobol/levels.cbl 27 lines changed, 27 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,27 @@ + IDENTIFICATION DIVISION. + PROGRAM-ID. Test-Items. + + DATA DIVISION. + WORKING-STORAGE SECTION. + 01 RECORD1. + 05 ITEM1 PIC X(1). + 05 ITEM2 PIC A(1). + 88 ODD VALUES 1, 3, 5, 7, 9. + 88 EVEN VALUES 2, 4, 6, 8. + 05 ITEM3 PIC X(6). + 66 RDITEM4 RENAMES ITEM1 THRU ITEM2. + 66 RDITEM5 RENAMES ITEM1 THROUGH ITEM3. + 77 STDLN1 PIC A(4). + 01 REC2. + 02 G1. + 05 ITEM1 PICTURE X(10). + 05 ITEM2 PIC X(10). + 66 OTHERNAME1 RENAMES ITEM1 IN REC2. + 66 OTHERNAME2 RENAMES G1. + + PROCEDURE DIVISION. + MAIN-PROCEDURE. + DISPLAY "Hello world". + DISPLAY OTHERNAME2. + STOP RUN. + END PROGRAM Test-Items. Modified: tests/ctags/cobol/levels.cbl.tags 22 lines changed, 22 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,22 @@ +# format=tagmanager +DATA�32�0 +EVEN�16384�RECORD1.ITEM2�0 +G1�2048�REC2�0 +IDENTIFICATION�32�0 +ITEM1�16384�REC2.G1�0 +ITEM1�16384�RECORD1�0 +ITEM2�16384�REC2.G1�0 +ITEM2�16384�RECORD1�0 +ITEM3�16384�RECORD1�0 +MAIN-PROCEDURE�65536�0 +ODD�16384�RECORD1.ITEM2�0 +OTHERNAME1�16384�REC2�0 +OTHERNAME2�16384�REC2�0 +PROCEDURE�32�0 +RDITEM4�16384�RECORD1�0 +RDITEM5�16384�RECORD1�0 +REC2�2048�0 +RECORD1�2048�0 +STDLN1�16384�0 +Test-Items�1�0 +WORKING-STORAGE�256�0 Modified: tests/ctags/cobol/quoted-program-id.cbl 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,7 @@ + IDENTIFICATION DIVISION. + PROGRAM-ID. 'Test program name'. + PROCEDURE DIVISION. + MAIN. + DISPLAY 'This is a test program'. + STOP RUN. + END PROGRAM 'Test program name'. Modified: tests/ctags/cobol/quoted-program-id.cbl.tags 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,5 @@ +# format=tagmanager +IDENTIFICATION�32�0 +MAIN�65536�0 +PROCEDURE�32�0 +Test program name�1�0 Modified: tests/ctags/cobol/simple.cbl 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: tests/ctags/cobol/simple.cbl.tags 22 lines changed, 22 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,22 @@ +# format=tagmanager +AUTHOR�65536�0 +Begin�65536�0 +DATA�32�0 +DW-DAYS-IN-MONTH�16384�Group-Name.Data-Item1.DW-DAYS-IN-MONTHS�0 +DW-DAYS-IN-MONTHS�16384�Group-Name.Data-Item1�0 +Data-Item1�16384�Group-Name�0 +ENVIRONMENT�32�0 +FILE�256�0 +FILE-CONTROL�65536�0 +File-Data-Item�16384�File-Group-Name�0 +File-Group-Name�2048�0 +File-Name�16�0 +Group-Name�2048�0 +IDENTIFICATION�32�0 +INPUT-OUPUT�256�0 +PROCEDURE�32�0 +Program-Name�1�0 +SH-WORK-MMDDYYYY�16384�Group-Name.Data-Item1�0 +SH-WORK-MMDDYYYY-2�16384�Group-Name.Data-Item1�0 +Subprogram-Name�65536�0 +WORKING-STORAGE�256�0 Modified: tests/ctags/simple.cbl.tags 19 lines changed, 0 insertions(+), 19 deletions(-) =================================================================== @@ -1,19 +0,0 @@ -# format=tagmanager -AUTHOR�65536�0 -Begin�65536�0 -DW-DAYS-IN-MONTH�16384�0 -DW-DAYS-IN-MONTHS�16384�0 -Data-Item1�16384�0 -FILE�256�0 -FILE-CONTROL�65536�0 -File-Data-Item�16384�0 -File-Group-Name�2048�0 -File-Name�16�0 -Group-Name�2048�0 -INPUT-OUPUT�256�0 -PROGRAM-ID�65536�0 -Program-Name�1�0 -SH-WORK-MMDDYYYY�16384�0 -SH-WORK-MMDDYYYY-2�16384�0 -Subprogram-Name�65536�0 -WORKING-STORAGE�256�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ec6e23: Add new upstream candidate Flex parser
by Colomban Wendling 27 Apr '19

27 Apr '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 27 Apr 2019 12:59:30 UTC Commit: ec6e2320dd48bb4043b9d373c05ac24b97e3d7f5 https://github.com/geany/geany/commit/ec6e2320dd48bb4043b9d373c05ac24b97e3d… Log Message: ----------- Add new upstream candidate Flex parser See: https://github.com/universal-ctags/ctags/pull/2084 This import has 3 difference with upstream, not to use newer API than current Geany has, and to workaround current limitations of Geany ctags calls: imports are enabled by default and don't have a specific role. Modified Paths: -------------- ctags/Makefile.am ctags/main/parsers.h ctags/parsers/actionscript.c ctags/parsers/flex.c src/symbols.c src/tagmanager/tm_parser.c tests/ctags/Makefile.am tests/ctags/actionscript/as-first-token.as tests/ctags/actionscript/as-first-token.as.tags tests/ctags/actionscript/classes.as tests/ctags/actionscript/classes.as.tags tests/ctags/actionscript/const.as tests/ctags/actionscript/const.as.tags tests/ctags/actionscript/const2.as tests/ctags/actionscript/const2.as.tags tests/ctags/actionscript/method-attributes.as tests/ctags/actionscript/method-attributes.as.tags tests/ctags/actionscript/packages.as tests/ctags/actionscript/packages.as.tags tests/ctags/actionscript/sampler.as tests/ctags/actionscript/sampler.as.tags Modified: ctags/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -11,7 +11,6 @@ noinst_LTLIBRARIES = libctags.la parsers = \ parsers/abaqus.c \ parsers/abc.c \ - parsers/actionscript.c \ parsers/asciidoc.c \ parsers/asm.c \ parsers/basic.c \ @@ -22,6 +21,7 @@ parsers = \ parsers/diff.c \ parsers/docbook.c \ parsers/erlang.c \ + parsers/flex.c \ parsers/fortran.c \ parsers/go.c \ parsers/haskell.c \ Modified: ctags/main/parsers.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -50,7 +50,7 @@ GLSLParser, \ MatLabParser, \ ValaParser, \ - ActionScriptParser, \ + FlexParser, \ NsisParser, \ MarkdownParser, \ Txt2tagsParser, \ Modified: ctags/parsers/actionscript.c 99 lines changed, 0 insertions(+), 99 deletions(-) =================================================================== @@ -1,99 +0,0 @@ -/* -* $Id: actionscript.c,v 1.1 2004/01/03 03:59:19 svoisen Exp $ -* -* Original file copyright (c) 2004, Sean Voisen -* -* Modified October 8, 2007 By Mike Fahy (VeryVito) of www.turdhead.com -* - Added initial AS3 support -* - Threw in some "TODO" and "NOTE" bits -* -* Modified October 9, 2007 By Ali Rantakari of hasseg.org: -* - Added more allowed AS3 attribute keywords (override, final, internal -* etc...) for classes, getters & setters, variables -* - Allowed varying versions of "note" and "todo" spellings -* - Allowed points (.) in package names so that they would display the -* whole package name instead of just the first level -* - Added interfaces matching support -* - Reformatted some name parameters: -* - Getters and setters: display either "get" or "set" in front -* of the property name -* - Todos & notes: made the name be the text that comes after the -* "todo" or "note" text -* - Variables: Moved the variable type after the name and separated -* them with " : " according to ActionScript syntax -* Modified March 6, 2009 by Chris Macksey (cmacksey(a)users.sourceforge.net) -* - Tweaked to work better with Geany -* -* This source code is released for free distribution under the terms of the -* GNU General Public License. -* -* This module contains functions for generating tags for ActionScript language -* files. -*/ - -/* -* INCLUDE FILES -*/ -#include "general.h" /* must always come first */ -#include "parse.h" -#include "routines.h" - -static tagRegexTable actionscriptTagRegexTable[] = { - /* Functions */ - {"^[ \t]*[(private|public|static|protected|internal|final|override)( \t)]*function[ \t]+([A-Za-z0-9_]+)[ \t]*\\(([^\\{]*)", - "\\1 (\\2", "f,function,functions,methods", NULL, NULL}, - - /* Getters and setters */ - {"^[ \t]*[(public|static|internal|final|override)( \t)]*function[ \t]+(set|get)[ \t]+([A-Za-z0-9_]+)[ \t]*\\(", - "\\2 \\1", "l,field,fields", NULL, NULL}, - - /* Variables */ - {"^[ \t]*[(private|public|static|protected|internal)( \t)]*var[ \t]+([A-Za-z0-9_]+)([ \t]*\\:[ \t]*([A-Za-z0-9_]+))*[ \t]*", - "\\1 \\: \\3", "v,variable,variables", NULL, NULL}, - - /* Constants */ - {"^[ \t]*[(private|public|static|protected|internal)( \t)]*const[ \t]+([A-Za-z0-9_]+)([ \t]*\\:[ \t]*([A-Za-z0-9_]+))*[ \t]*", - "\\1 : \\3", "m,macro,macros", NULL, NULL}, - - /* Classes */ - {"^[ \t]*[(private|public|static|dynamic|final|internal)( \t)]*class[ \t]+([A-Za-z0-9_]+)[ \t]*([^\\{]*)", - "\\1 (\\2)", "c,class,classes", NULL, NULL}, - - /* Interfaces */ - {"^[ \t]*[(private|public|static|dynamic|final|internal)( \t)]*interface[ \t]+([A-Za-z0-9_]+)[ \t]*([^\\{]*)", - "\\1 (\\2)", "i,interface,interfaces", NULL, NULL}, - - /* Packages */ - {"^[ \t]*[(private|public|static)( \t)]*package[ \t]+([A-Za-z0-9_.]+)[ \t]*", - "\\1", "p,package", NULL, NULL}, - - /* Notes */ - {"\\/\\/[ \t]*(NOTE|note|Note)[ \t]*\\:*(.*)", - "\\2", "o,other", NULL, NULL}, - - /* Todos */ - {"\\/\\/[ \t]*(TODO|todo|ToDo|Todo)[ \t]*\\:*(.*)", - "\\2", "o,other", NULL, NULL}, - - /* Prototypes (Put this in for AS1 compatibility...) */ - {".*\\.prototype\\.([A-Za-z0-9 ]+)[ \t]*\\=([ \t]*)function( [ \t]?)*\\(", - "\\1", "r,prototype", NULL, NULL} -}; - -/* -* FUNCTION DEFINITIONS -* -*/ - -/* Create parser definition structure */ -extern parserDefinition* ActionScriptParser (void) -{ - static const char *const extensions [] = { "as", NULL }; - parserDefinition *const def = parserNew ("ActionScript"); - def->extensions = extensions; - def->tagRegexTable = actionscriptTagRegexTable; - def->tagRegexCount = ARRAY_SIZE (actionscriptTagRegexTable); - def->method = METHOD_NOT_CRAFTED|METHOD_REGEX; - return def; -} - Modified: ctags/parsers/flex.c 2636 lines changed, 2636 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,2636 @@ +/* + * Copyright (c) 2008, David Fishburn + * + * This source code is released for free distribution under the terms of the + * GNU General Public License version 2 or (at your option) any later version. + * + * This module contains functions for generating tags for Adobe languages. + * There are a number of different ones, but this will begin with: + * Flex + * MXML files (*.mMacromedia XML) + * ActionScript files (*.as) + * + * The ActionScript code was copied from the JavaScript parser, with some + * adaptations e.g. for classes and type specifiers. + * + * Flex 3 language reference + * http://livedocs.adobe.com/flex/3/langref/index.html + * https://help.adobe.com/en_US/FlashPlatform/reference/actionscript/3/languag… + * https://www.adobe.com/devnet/actionscript/learning/as3-fundamentals/package… + */ + +/* + * INCLUDE FILES + */ +#include "general.h" /* must always come first */ +#include <ctype.h> /* to define isalpha () */ +#ifdef DEBUG +#include <stdio.h> +#endif + +#include "debug.h" +#include "entry.h" +#include "keyword.h" +#include "parse.h" +#include "read.h" +#include "routines.h" +#include "vstring.h" +#include "strlist.h" + +/* + * MACROS + */ +#define isType(token,t) (bool) ((token)->type == (t)) +#define isKeyword(token,k) (bool) ((token)->keyword == (k)) +#define isEOF(token) (isType ((token), TOKEN_EOF)) +#define isIdentChar(c) \ + (isalpha (c) || isdigit (c) || (c) == '$' || \ + (c) == '@' || (c) == '_' || (c) == '#' || \ + (c) >= 0x80) + +/* + * DATA DECLARATIONS + */ + +/* + * Tracks class and function names already created + */ +static stringList *ClassNames; +static stringList *FunctionNames; + +/* Used to specify type of keyword. +*/ +enum eKeywordId { + KEYWORD_function, + KEYWORD_capital_function, + KEYWORD_object, + KEYWORD_capital_object, + KEYWORD_prototype, + KEYWORD_var, + KEYWORD_const, + KEYWORD_new, + KEYWORD_this, + KEYWORD_for, + KEYWORD_while, + KEYWORD_do, + KEYWORD_if, + KEYWORD_else, + KEYWORD_switch, + KEYWORD_try, + KEYWORD_catch, + KEYWORD_finally, + KEYWORD_return, + KEYWORD_public, + KEYWORD_private, + KEYWORD_protected, + KEYWORD_internal, + KEYWORD_final, + KEYWORD_native, + KEYWORD_dynamic, + KEYWORD_class, + KEYWORD_interface, + KEYWORD_package, + KEYWORD_extends, + KEYWORD_static, + KEYWORD_implements, + KEYWORD_get, + KEYWORD_set, + KEYWORD_import, + KEYWORD_id, + KEYWORD_name, + KEYWORD_script, + KEYWORD_cdata, + KEYWORD_mx, + KEYWORD_fx, + KEYWORD_override +}; +typedef int keywordId; /* to allow KEYWORD_NONE */ + +typedef enum eTokenType { + TOKEN_UNDEFINED, + TOKEN_EOF, + TOKEN_CHARACTER, + TOKEN_CLOSE_PAREN, + TOKEN_SEMICOLON, + TOKEN_COLON, + TOKEN_COMMA, + TOKEN_KEYWORD, + TOKEN_OPEN_PAREN, + TOKEN_IDENTIFIER, + TOKEN_STRING, + TOKEN_PERIOD, + TOKEN_OPEN_CURLY, + TOKEN_CLOSE_CURLY, + TOKEN_EQUAL_SIGN, + TOKEN_EXCLAMATION, + TOKEN_FORWARD_SLASH, + TOKEN_OPEN_SQUARE, + TOKEN_CLOSE_SQUARE, + TOKEN_OPEN_MXML, + TOKEN_CLOSE_MXML, + TOKEN_CLOSE_SGML, + TOKEN_LESS_THAN, + TOKEN_GREATER_THAN, + TOKEN_QUESTION_MARK, + TOKEN_OPEN_NAMESPACE, + TOKEN_POSTFIX_OPERATOR, + TOKEN_STAR, + TOKEN_BINARY_OPERATOR +} tokenType; + +typedef struct sTokenInfo { + tokenType type; + keywordId keyword; + vString * string; + vString * scope; + unsigned long lineNumber; + MIOPos filePosition; + int nestLevel; + bool ignoreTag; + bool isClass; +} tokenInfo; + +/* + * DATA DEFINITIONS + */ +static tokenType LastTokenType; +static tokenInfo *NextToken; + +static langType Lang_flex; + +typedef enum { + FLEXTAG_FUNCTION, + FLEXTAG_CLASS, + FLEXTAG_INTERFACE, + FLEXTAG_PACKAGE, + FLEXTAG_METHOD, + FLEXTAG_PROPERTY, + FLEXTAG_VARIABLE, + FLEXTAG_LOCALVAR, + FLEXTAG_CONST, + FLEXTAG_IMPORT, + FLEXTAG_MXTAG, + FLEXTAG_COUNT +} flexKind; + +typedef enum { + FLEX_IMPORT_ROLE_IMPORTED, +} flexImportRole; + +static roleDefinition FlexImportRoles [] = { + { true, "import", "imports" }, +}; + +static kindDefinition FlexKinds [] = { + { true, 'f', "function", "functions" }, + { true, 'c', "class", "classes" }, + { true, 'i', "interface", "interfaces" }, + { true, 'P', "package", "packages" }, + { true, 'm', "method", "methods" }, + { true, 'p', "property", "properties" }, + { true, 'v', "variable", "global variables" }, + { /*false*/ true, 'l', "localvar", "local variables" }, + { true, 'C', "constant", "constants" }, + { true, 'I', "import", "imports", + .referenceOnly = true, ATTACH_ROLES (FlexImportRoles) }, + { true, 'x', "mxtag", "mxtags" } +}; + +/* Used to determine whether keyword is valid for the token language and + * what its ID is. + */ +static const keywordTable FlexKeywordTable [] = { + /* keyword keyword ID */ + { "function", KEYWORD_function }, + { "Function", KEYWORD_capital_function }, + { "object", KEYWORD_object }, + { "Object", KEYWORD_capital_object }, + { "prototype", KEYWORD_prototype }, + { "var", KEYWORD_var }, + { "const", KEYWORD_const }, + { "new", KEYWORD_new }, + { "this", KEYWORD_this }, + { "for", KEYWORD_for }, + { "while", KEYWORD_while }, + { "do", KEYWORD_do }, + { "if", KEYWORD_if }, + { "else", KEYWORD_else }, + { "switch", KEYWORD_switch }, + { "try", KEYWORD_try }, + { "catch", KEYWORD_catch }, + { "finally", KEYWORD_finally }, + { "return", KEYWORD_return }, + { "public", KEYWORD_public }, + { "private", KEYWORD_private }, + { "protected", KEYWORD_protected }, + { "internal", KEYWORD_internal }, + { "final", KEYWORD_final }, + { "native", KEYWORD_native }, + { "dynamic", KEYWORD_dynamic }, + { "class", KEYWORD_class }, + { "interface", KEYWORD_interface }, + { "package", KEYWORD_package }, + { "extends", KEYWORD_extends }, + { "static", KEYWORD_static }, + { "implements", KEYWORD_implements }, + { "get", KEYWORD_get }, + { "set", KEYWORD_set }, + { "import", KEYWORD_import }, + { "id", KEYWORD_id }, + { "name", KEYWORD_name }, + { "script", KEYWORD_script }, + { "cdata", KEYWORD_cdata }, + { "mx", KEYWORD_mx }, + { "fx", KEYWORD_fx }, + { "override", KEYWORD_override } +}; + +/* + * FUNCTION DEFINITIONS + */ + +/* Recursive functions */ +static void parseFunction (tokenInfo *const token); +static bool parseBlock (tokenInfo *const token, const vString *const parentScope); +static bool parseLine (tokenInfo *const token); +static bool parseActionScript (tokenInfo *const token, bool readNext); +static bool parseMXML (tokenInfo *const token); + +static tokenInfo *newToken (void) +{ + tokenInfo *const token = xMalloc (1, tokenInfo); + + token->type = TOKEN_UNDEFINED; + token->keyword = KEYWORD_NONE; + token->string = vStringNew (); + token->scope = vStringNew (); + token->nestLevel = 0; + token->isClass = false; + token->ignoreTag = false; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + + return token; +} + +static void deleteToken (tokenInfo *const token) +{ + vStringDelete (token->string); + vStringDelete (token->scope); + eFree (token); +} + +static void copyToken (tokenInfo *const dest, tokenInfo *const src, + bool const include_non_read_info) +{ + dest->lineNumber = src->lineNumber; + dest->filePosition = src->filePosition; + dest->type = src->type; + dest->keyword = src->keyword; + dest->isClass = src->isClass; + vStringCopy(dest->string, src->string); + if (include_non_read_info) + { + dest->nestLevel = src->nestLevel; + vStringCopy(dest->scope, src->scope); + } +} + +/* + * Tag generation functions + */ + +static vString *buildQualifiedName (const tokenInfo *const token) +{ + vString *qualified = vStringNew (); + + if (vStringLength (token->scope) > 0) + { + vStringCopy (qualified, token->scope); + vStringPut (qualified, '.'); + } + vStringCat (qualified, token->string); + + return qualified; +} + +static void makeConstTag (tokenInfo *const token, const flexKind kind) +{ + if (FlexKinds [kind].enabled && ! token->ignoreTag ) + { + const char *const name = vStringValue (token->string); + tagEntryInfo e; + int role = ROLE_INDEX_DEFINITION; + + /* Geany diff: reftags are not enabled but should be + if (kind == FLEXTAG_IMPORT) + role = FLEX_IMPORT_ROLE_IMPORTED; + */ + + initRefTagEntry (&e, name, kind, role); + + e.lineNumber = token->lineNumber; + e.filePosition = token->filePosition; + + if ( vStringLength(token->scope) > 0 ) + { + /* FIXME: proper parent type */ + flexKind parent_kind = FLEXTAG_CLASS; + + /* + * If we're creating a function (and not a method), + * guess we're inside another function + */ + if (kind == FLEXTAG_FUNCTION) + parent_kind = FLEXTAG_FUNCTION; + /* mxtags can only be nested inside other mxtags */ + else if (kind == FLEXTAG_MXTAG) + parent_kind = kind; + + e.extensionFields.scopeKindIndex = parent_kind; + e.extensionFields.scopeName = vStringValue (token->scope); + } + + makeTagEntry (&e); + + /* make qualified tags for compatibility if requested */ + if (isXtagEnabled (XTAG_QUALIFIED_TAGS)) + { + vString *qualified = buildQualifiedName (token); + + markTagExtraBit (&e, XTAG_QUALIFIED_TAGS); + e.name = vStringValue (qualified); + makeTagEntry (&e); + vStringDelete (qualified); + } + } +} + +static void makeFlexTag (tokenInfo *const token, flexKind kind) +{ + if (FlexKinds [kind].enabled && ! token->ignoreTag ) + { + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n makeFlexTag start: token isClass:%d scope:%s name:%s\n" + , token->isClass + , vStringValue(token->scope) + , vStringValue(token->string) + ); + ); + if (kind == FLEXTAG_FUNCTION && token->isClass ) + { + kind = FLEXTAG_METHOD; + } + makeConstTag (token, kind); + } +} + +static void makeClassTag (tokenInfo *const token) +{ + if ( ! token->ignoreTag ) + { + vString *fulltag = buildQualifiedName (token); + + if ( ! stringListHas(ClassNames, vStringValue (fulltag)) ) + { + stringListAdd (ClassNames, vStringNewCopy (fulltag)); + makeFlexTag (token, FLEXTAG_CLASS); + } + vStringDelete (fulltag); + } +} + +static void makeMXTag (tokenInfo *const token) +{ + if ( ! token->ignoreTag ) + { + makeFlexTag (token, FLEXTAG_MXTAG); + } +} + +static void makeFunctionTag (tokenInfo *const token) +{ + if ( ! token->ignoreTag ) + { + vString *fulltag = buildQualifiedName (token); + + if ( ! stringListHas(FunctionNames, vStringValue (fulltag)) ) + { + stringListAdd (FunctionNames, vStringNewCopy (fulltag)); + makeFlexTag (token, FLEXTAG_FUNCTION); + } + vStringDelete (fulltag); + } +} + +/* + * Parsing functions + */ + +static void parseString (vString *const string, const int delimiter) +{ + bool end = false; + while (! end) + { + int c = getcFromInputFile (); + if (c == EOF) + end = true; + else if (c == '\\') + { + c = getcFromInputFile(); /* This maybe a ' or ". */ + vStringPut(string, c); + } + else if (c == delimiter) + end = true; + else + vStringPut (string, c); + } +} + +/* Read a C identifier beginning with "firstChar" and places it into + * "name". + */ +static void parseIdentifier (vString *const string, const int firstChar) +{ + int c = firstChar; + Assert (isIdentChar (c)); + do + { + vStringPut (string, c); + c = getcFromInputFile (); + } while (isIdentChar (c)); + ungetcToInputFile (c); /* unget non-identifier character */ +} + +static void readTokenFull (tokenInfo *const token, bool include_newlines) +{ + int c; + int i; + bool newline_encountered = false; + + /* if we've got a token held back, emit it */ + if (NextToken) + { + copyToken (token, NextToken, false); + deleteToken (NextToken); + NextToken = NULL; + return; + } + + token->type = TOKEN_UNDEFINED; + token->keyword = KEYWORD_NONE; + vStringClear (token->string); + +getNextChar: + i = 0; + do + { + c = getcFromInputFile (); + if (include_newlines && (c == '\r' || c == '\n')) + newline_encountered = true; + i++; + } + while (c == '\t' || c == ' ' || c == '\r' || c == '\n'); + + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + + switch (c) + { + case EOF: token->type = TOKEN_EOF; break; + case '(': token->type = TOKEN_OPEN_PAREN; break; + case ')': token->type = TOKEN_CLOSE_PAREN; break; + case ';': token->type = TOKEN_SEMICOLON; break; + case ',': token->type = TOKEN_COMMA; break; + case '.': token->type = TOKEN_PERIOD; break; + case ':': token->type = TOKEN_COLON; break; + case '{': token->type = TOKEN_OPEN_CURLY; break; + case '}': token->type = TOKEN_CLOSE_CURLY; break; + case '=': token->type = TOKEN_EQUAL_SIGN; break; + case '[': token->type = TOKEN_OPEN_SQUARE; break; + case ']': token->type = TOKEN_CLOSE_SQUARE; break; + case '?': token->type = TOKEN_QUESTION_MARK; break; + + case '+': + case '-': + { + int d = getcFromInputFile (); + if (d == c) /* ++ or -- */ + token->type = TOKEN_POSTFIX_OPERATOR; + else + { + ungetcToInputFile (d); + token->type = TOKEN_BINARY_OPERATOR; + } + break; + } + + case '*': + token->type = TOKEN_STAR; + break; + case '%': + case '^': + case '|': + case '&': + token->type = TOKEN_BINARY_OPERATOR; + break; + + case '\'': + case '"': + token->type = TOKEN_STRING; + parseString (token->string, c); + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + + case '\\': + c = getcFromInputFile (); + if (c != '\\' && c != '"' && !isspace (c)) + ungetcToInputFile (c); + token->type = TOKEN_CHARACTER; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + + case '/': + { + int d = getcFromInputFile (); + if ( (d != '*') && /* is this the start of a comment? */ + (d != '/') && /* is a one line comment? */ + (d != '>') ) /* is this a close XML tag? */ + { + ungetcToInputFile (d); + token->type = TOKEN_FORWARD_SLASH; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + } + else + { + if (d == '*') + { + do + { + skipToCharacterInInputFile ('*'); + c = getcFromInputFile (); + if (c == '/') + break; + else + ungetcToInputFile (c); + } while (c != EOF); + goto getNextChar; + } + else if (d == '/') /* is this the start of a comment? */ + { + skipToCharacterInInputFile ('\n'); + /* if we care about newlines, put it back so it is seen */ + if (include_newlines) + ungetcToInputFile ('\n'); + goto getNextChar; + } + else if (d == '>') /* is this the start of a comment? */ + { + token->type = TOKEN_CLOSE_SGML; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + } + } + break; + } + + case '<': + { + /* + * An XML comment looks like this + *  + */ + int d = getcFromInputFile (); + + if ( (d != '!' ) && /* is this the start of a comment? */ + (d != '/' ) && /* is this the start of a closing mx tag */ + (d != 'm' ) && /* is this the start of a mx tag */ + (d != 'f' ) && /* is this the start of a fx tag */ + (d != 's' ) ) /* is this the start of a spark tag */ + { + ungetcToInputFile (d); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + else + { + if (d == '!') + { + int e = getcFromInputFile (); + if ( e != '-' ) /* is this the start of a comment? */ + { + ungetcToInputFile (e); + ungetcToInputFile (d); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + } + else + { + if (e == '-') + { + int f = getcFromInputFile (); + if ( f != '-' ) /* is this the start of a comment? */ + { + ungetcToInputFile (f); + ungetcToInputFile (e); + ungetcToInputFile (d); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + } + else + { + if (f == '-') + { + do + { + skipToCharacterInInputFile ('-'); + c = getcFromInputFile (); + if (c == '-') + { + d = getcFromInputFile (); + if (d == '>') + break; + else + { + ungetcToInputFile (d); + ungetcToInputFile (c); + } + break; + } + else + ungetcToInputFile (c); + } while (c != EOF && c != '\0'); + goto getNextChar; + } + } + } + } + } + else if (d == 'm' || d == 'f' || d == 's' ) + { + int e = getcFromInputFile (); + if ( (d == 'm' || d == 'f') && e != 'x' ) /* continuing an mx or fx tag */ + { + ungetcToInputFile (e); + ungetcToInputFile (d); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + else + { + if ( (d == 'm' || d == 'f') && e == 'x' ) + { + int f = getcFromInputFile (); + if ( f != ':' ) /* start of the tag */ + { + ungetcToInputFile (f); + ungetcToInputFile (e); + ungetcToInputFile (d); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + else + { + token->type = TOKEN_OPEN_MXML; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + } + if ( d == 's' && e == ':') /* continuing a spark tag */ + { + token->type = TOKEN_OPEN_MXML; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + else + { + ungetcToInputFile (e); + ungetcToInputFile (d); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + } + } + else if (d == '/') + { + int e = getcFromInputFile (); + if ( !(e == 'm' || e == 'f' || e == 's' )) + { + ungetcToInputFile (e); + ungetcToInputFile (d); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + else + { + int f = getcFromInputFile (); + if ( (e == 'm' || e == 'f') && f != 'x' ) /* continuing an mx or fx tag */ + { + ungetcToInputFile (f); + ungetcToInputFile (e); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + else + { + if (f == 'x') + { + int g = getcFromInputFile (); + if ( g != ':' ) /* is this the start of a comment? */ + { + ungetcToInputFile (g); + ungetcToInputFile (f); + ungetcToInputFile (e); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + else + { + token->type = TOKEN_CLOSE_MXML; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + } + if ( e == 's' && f == ':') /* continuing a spark tag */ + { + token->type = TOKEN_CLOSE_MXML; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + else + { + ungetcToInputFile (f); + ungetcToInputFile (e); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + } + } + } + } + break; + } + + case '>': + token->type = TOKEN_GREATER_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + + case '!': + token->type = TOKEN_EXCLAMATION; + /*token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition ();*/ + break; + + default: + if (! isIdentChar (c)) + token->type = TOKEN_UNDEFINED; + else + { + parseIdentifier (token->string, c); + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + token->keyword = lookupCaseKeyword (vStringValue (token->string), Lang_flex); + if (isKeyword (token, KEYWORD_NONE)) + token->type = TOKEN_IDENTIFIER; + else + token->type = TOKEN_KEYWORD; + } + break; + } + + if (include_newlines && newline_encountered) + { + /* This isn't strictly correct per the standard, but following the + * real rules means understanding all statements, and that's not + * what the parser currently does. What we do here is a guess, by + * avoiding inserting semicolons that would make the statement on + * the left or right obviously invalid. Hopefully this should not + * have false negatives (e.g. should not miss insertion of a semicolon) + * but might have false positives (e.g. it will wrongfully emit a + * semicolon sometimes, i.e. for the newline in "foo\n(bar)"). + * This should however be mostly harmless as we only deal with + * newlines in specific situations where we know a false positive + * wouldn't hurt too bad. */ + + /* these already end a statement, so no need to duplicate it */ + #define IS_STMT_SEPARATOR(t) ((t) == TOKEN_SEMICOLON || \ + (t) == TOKEN_EOF || \ + (t) == TOKEN_COMMA || \ + (t) == TOKEN_OPEN_CURLY) + /* these cannot be the start or end of a statement */ + #define IS_BINARY_OPERATOR(t) ((t) == TOKEN_EQUAL_SIGN || \ + (t) == TOKEN_COLON || \ + (t) == TOKEN_PERIOD || \ + (t) == TOKEN_STAR || \ + (t) == TOKEN_FORWARD_SLASH || \ + (t) == TOKEN_QUESTION_MARK || \ + (t) == TOKEN_LESS_THAN || \ + (t) == TOKEN_GREATER_THAN || \ + (t) == TOKEN_BINARY_OPERATOR) + + if (! IS_STMT_SEPARATOR(LastTokenType) && + ! IS_STMT_SEPARATOR(token->type) && + ! IS_BINARY_OPERATOR(LastTokenType) && + ! IS_BINARY_OPERATOR(token->type) && + /* these cannot be followed by a semicolon */ + ! (LastTokenType == TOKEN_OPEN_PAREN || + LastTokenType == TOKEN_OPEN_SQUARE)) + { + /* hold the token... */ + Assert (NextToken == NULL); + NextToken = newToken (); + copyToken (NextToken, token, false); + + /* ...and emit a semicolon instead */ + token->type = TOKEN_SEMICOLON; + token->keyword = KEYWORD_NONE; + vStringClear (token->string); + } + + #undef IS_STMT_SEPARATOR + #undef IS_BINARY_OPERATOR + } + + LastTokenType = token->type; +} + +static void readToken (tokenInfo *const token) +{ + readTokenFull (token, false); +} + +/* + * Token parsing functions + */ + +static void skipArgumentList (tokenInfo *const token, bool include_newlines) +{ + int nest_level = 0; + + if (isType (token, TOKEN_OPEN_PAREN)) /* arguments? */ + { + nest_level++; + while (nest_level > 0 && ! isType (token, TOKEN_EOF)) + { + readToken (token); + if (isType (token, TOKEN_OPEN_PAREN)) + nest_level++; + else if (isType (token, TOKEN_CLOSE_PAREN)) + nest_level--; + } + readTokenFull (token, include_newlines); + } +} + +static void skipArrayList (tokenInfo *const token, bool include_newlines) +{ + int nest_level = 0; + + /* + * Handle square brackets + * var name[1] + * So we must check for nested open and closing square brackets + */ + + if (isType (token, TOKEN_OPEN_SQUARE)) /* arguments? */ + { + nest_level++; + while (nest_level > 0 && ! isType (token, TOKEN_EOF)) + { + readToken (token); + if (isType (token, TOKEN_OPEN_SQUARE)) + nest_level++; + else if (isType (token, TOKEN_CLOSE_SQUARE)) + nest_level--; + } + readTokenFull (token, include_newlines); + } +} + +static void addContext (tokenInfo* const parent, const tokenInfo* const child) +{ + if (vStringLength (parent->string) > 0) + { + vStringPut (parent->string, '.'); + } + vStringCat (parent->string, child->string); +} + +static void addToScope (tokenInfo* const token, const vString* const extra) +{ + if (vStringLength (token->scope) > 0) + { + vStringPut (token->scope, '.'); + } + vStringCat (token->scope, extra); +} + +/* + * Scanning functions + */ + +static bool findCmdTerm (tokenInfo *const token, bool include_newlines, + bool include_commas) +{ + /* + * Read until we find either a semicolon or closing brace. + * Any nested braces will be handled within. + */ + while (! isType (token, TOKEN_SEMICOLON) && + ! isType (token, TOKEN_CLOSE_CURLY) && + ! (include_commas && isType (token, TOKEN_COMMA)) && + ! isType (token, TOKEN_EOF)) + { + /* Handle nested blocks */ + if ( isType (token, TOKEN_OPEN_CURLY)) + { + parseBlock (token, NULL); + readTokenFull (token, include_newlines); + } + else if ( isType (token, TOKEN_OPEN_PAREN) ) + { + skipArgumentList(token, include_newlines); + } + else if ( isType (token, TOKEN_OPEN_SQUARE) ) + { + skipArrayList(token, include_newlines); + } + else + { + readTokenFull (token, include_newlines); + } + } + + return isType (token, TOKEN_SEMICOLON); +} + +static void parseSwitch (tokenInfo *const token) +{ + /* + * switch (expression) { + * case value1: + * statement; + * break; + * case value2: + * statement; + * break; + * default : statement; + * } + */ + + readToken (token); + + if (isType (token, TOKEN_OPEN_PAREN)) + { + skipArgumentList(token, false); + } + + if (isType (token, TOKEN_OPEN_CURLY)) + { + parseBlock (token, NULL); + } +} + +static bool parseLoop (tokenInfo *const token) +{ + /* + * Handles these statements + * for (x=0; x<3; x++) + * document.write("This text is repeated three times "); + * + * for (x=0; x<3; x++) + * { + * document.write("This text is repeated three times "); + * } + * + * while (number<5){ + * document.write(number+" "); + * number++; + * } + * + * do{ + * document.write(number+" "); + * number++; + * } + * while (number<5); + */ + bool is_terminated = true; + + if (isKeyword (token, KEYWORD_for) || isKeyword (token, KEYWORD_while)) + { + readToken(token); + + if (isType (token, TOKEN_OPEN_PAREN)) + { + skipArgumentList(token, false); + } + + if (isType (token, TOKEN_OPEN_CURLY)) + { + parseBlock (token, NULL); + } + else + { + is_terminated = parseLine(token); + } + } + else if (isKeyword (token, KEYWORD_do)) + { + readToken(token); + + if (isType (token, TOKEN_OPEN_CURLY)) + { + parseBlock (token, NULL); + } + else + { + is_terminated = parseLine(token); + } + + if (is_terminated) + readToken(token); + + if (isKeyword (token, KEYWORD_while)) + { + readToken(token); + + if (isType (token, TOKEN_OPEN_PAREN)) + { + skipArgumentList(token, true); + } + if (! isType (token, TOKEN_SEMICOLON)) + { + /* oddly enough, `do {} while (0) var foo = 42` is perfectly + * valid AS, so explicitly handle the remaining of the line + * for the sake of the root scope handling (as parseActionScript() + * always advances a token not to ever get stuck) */ + is_terminated = parseLine(token); + } + } + } + + return is_terminated; +} + +static bool parseIf (tokenInfo *const token) +{ + bool read_next_token = true; + /* + * If statements have two forms + * if ( ... ) + * one line; + * + * if ( ... ) + * statement; + * else + * statement + * + * if ( ... ) { + * multiple; + * statements; + * } + * + * + * if ( ... ) { + * return elem + * } + * + * This example if correctly written, but the + * else contains only 1 statement without a terminator + * since the function finishes with the closing brace. + * + * function a(flag){ + * if(flag) + * test(1); + * else + * test(2) + * } + * + * TODO: Deal with statements that can optional end + * without a semi-colon. Currently this messes up + * the parsing of blocks. + * Need to somehow detect this has happened, and either + * backup a token, or skip reading the next token if + * that is possible from all code locations. + * + */ + + readToken (token); + + if (isKeyword (token, KEYWORD_if)) + { + /* + * Check for an "else if" and consume the "if" + */ + readToken (token); + } + + if (isType (token, TOKEN_OPEN_PAREN)) + { + skipArgumentList(token, false); + } + + if (isType (token, TOKEN_OPEN_CURLY)) + { + parseBlock (token, NULL); + } + else + { + /* The next token should only be read if this statement had its own + * terminator */ + read_next_token = findCmdTerm (token, true, false); + } + return read_next_token; +} + +static bool parseImport (tokenInfo *const token) +{ + if (! isKeyword (token, KEYWORD_import)) + return false; + + readToken (token); + + if (isType (token, TOKEN_IDENTIFIER)) + { + tokenInfo *const name = newToken (); + + copyToken (name, token, true); + readToken (token); + while (isType (token, TOKEN_PERIOD)) + { + vStringPut (name->string, '.'); + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + vStringCat (name->string, token->string); + else if (isType (token, TOKEN_STAR)) + vStringPut (name->string, '*'); + if (isType (token, TOKEN_IDENTIFIER) || isType (token, TOKEN_STAR)) + readToken (token); + } + + makeFlexTag (name, FLEXTAG_IMPORT); + deleteToken (name); + } + + return isType (token, TOKEN_SEMICOLON); +} + +static void parseFunction (tokenInfo *const token) +{ + tokenInfo *const name = newToken (); + flexKind kind = FLEXTAG_FUNCTION; + + /* + * This deals with these formats + * private static function ioErrorHandler( event:IOErrorEvent ):void { + * public function get prop():String {} + * public function set prop(param:String):void {} + */ + + if ( isKeyword(token, KEYWORD_function) ) + { + readToken (token); + } + + /* getter and setter */ + if (isKeyword (token, KEYWORD_get) || + isKeyword (token, KEYWORD_set)) + { + kind = FLEXTAG_PROPERTY; + readToken (token); + } + + copyToken (name, token, true); + /* Add scope in case this is an INNER function + addToScope(name, token->scope); + */ + + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseFunction: token isClass:%d scope:%s name:%s\n" + , token->isClass + , vStringValue(token->scope) + , vStringValue(token->string) + ); + ); + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseFunction: name isClass:%d scope:%s name:%s\n" + , name->isClass + , vStringValue(name->scope) + , vStringValue(name->string) + ); + ); + + readToken (token); + + if ( isType (token, TOKEN_OPEN_PAREN) ) + skipArgumentList(token, false); + + if ( isType (token, TOKEN_COLON) ) + { + /* + * function fname ():ReturnType + */ + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + readToken (token); + } + + if ( isType (token, TOKEN_OPEN_CURLY) ) + { + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseFunction end: name isClass:%d scope:%s name:%s\n" + , name->isClass + , vStringValue(name->scope) + , vStringValue(name->string) + ); + ); + parseBlock (token, name->string); + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseFunction end2: token isClass:%d scope:%s name:%s\n" + , token->isClass + , vStringValue(token->scope) + , vStringValue(token->string) + ); + ); + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseFunction end2: token isClass:%d scope:%s name:%s\n" + , token->isClass + , vStringValue(token->scope) + , vStringValue(token->string) + ); + ); + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseFunction end3: name isClass:%d scope:%s name:%s\n" + , name->isClass + , vStringValue(name->scope) + , vStringValue(name->string) + ); + ); + if (kind == FLEXTAG_FUNCTION) + makeFunctionTag (name); + else + makeFlexTag (name, kind); + } + + findCmdTerm (token, false, false); + + deleteToken (name); +} + +/* Parses a block surrounded by curly braces. + * @p parentScope is the scope name for this block, or NULL for unnamed scopes */ +static bool parseBlock (tokenInfo *const token, const vString *const parentScope) +{ + bool read_next_token = true; + vString * saveScope = vStringNew (); + + vStringCopy (saveScope, token->scope); + if (parentScope) + { + addToScope (token, parentScope); + token->nestLevel++; + } + + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseBlock start: token isClass:%d scope:%s name:%s\n" + , token->isClass + , vStringValue(token->scope) + , vStringValue(token->string) + ); + ); + /* + * Make this routine a bit more forgiving. + * If called on an open_curly advance it + */ + if (isType (token, TOKEN_OPEN_CURLY)) + readToken(token); + + if (! isType (token, TOKEN_CLOSE_CURLY)) + { + /* + * Read until we find the closing brace, + * any nested braces will be handled within + */ + do + { + if (isType (token, TOKEN_OPEN_CURLY)) + { + /* Handle nested blocks */ + parseBlock (token, NULL); + } + else + { + /* + * It is possible for a line to have no terminator + * if the following line is a closing brace. + * parseLine will detect this case and indicate + * whether we should read an additional token. + */ + read_next_token = parseLine (token); + } + + /* + * Always read a new token unless we find a statement without + * a ending terminator + */ + if( read_next_token ) + readToken(token); + + /* + * If we find a statement without a terminator consider the + * block finished, otherwise the stack will be off by one. + */ + } while (! isType (token, TOKEN_EOF) && + ! isType (token, TOKEN_CLOSE_CURLY) && read_next_token); + } + + vStringCopy(token->scope, saveScope); + vStringDelete(saveScope); + if (parentScope) + token->nestLevel--; + + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseBlock end: token isClass:%d scope:%s name:%s\n" + , token->isClass + , vStringValue(token->scope) + , vStringValue(token->string) + ); + ); + return false; +} + +static void parseMethods (tokenInfo *const token, const tokenInfo *const class) +{ + tokenInfo *const name = newToken (); + vString *saveScope = vStringNew (); + + vStringCopy (saveScope, token->scope); + addToScope (token, class->string); + + /* + * This deals with these formats + * validProperty : 2, + * validMethod : function(a,b) {} + * 'validMethod2' : function(a,b) {} + * container.dirtyTab = {'url': false, 'title':false, 'snapshot':false, '*': false} + */ + + do + { + readToken (token); + if (isType (token, TOKEN_CLOSE_CURLY)) + { + goto cleanUp; + } + + if (isType (token, TOKEN_STRING) || isKeyword(token, KEYWORD_NONE)) + { + copyToken (name, token, true); + + readToken (token); + if ( isType (token, TOKEN_COLON) ) + { + readToken (token); + if ( isKeyword (token, KEYWORD_function) ) + { + readToken (token); + if ( isType (token, TOKEN_OPEN_PAREN) ) + { + skipArgumentList(token, false); + } + + if (isType (token, TOKEN_OPEN_CURLY)) + { + makeFlexTag (name, FLEXTAG_METHOD); + parseBlock (token, name->string); + + /* + * Read to the closing curly, check next + * token, if a comma, we must loop again + */ + readToken (token); + } + } + else + { + makeFlexTag (name, FLEXTAG_PROPERTY); + + /* + * Read the next token, if a comma + * we must loop again + */ + readToken (token); + } + } + } + } while ( isType(token, TOKEN_COMMA)); + + findCmdTerm (token, false, false); + +cleanUp: + vStringCopy (token->scope, saveScope); + vStringDelete (saveScope); + deleteToken (name); +} + +static bool parseVar (tokenInfo *const token, bool is_public) +{ + tokenInfo *const name = newToken (); + bool is_terminated = true; + flexKind kind = is_public ? FLEXTAG_VARIABLE : FLEXTAG_LOCALVAR; + + /* + * Variables are defined as: + * private static var lastFaultMessage:Date = new Date( 0 ); + * private static var webRequests:ArrayCollection = new ArrayCollection(); + */ + + if ( isKeyword(token, KEYWORD_var) ) + { + readToken(token); + } + else if (isKeyword(token, KEYWORD_const)) + { + kind = FLEXTAG_CONST; + readToken(token); + } + + /* Variable name */ + copyToken (name, token, true); + readToken(token); + + if ( isType (token, TOKEN_COLON) ) + { + /* + * var vname ():DataType = new Date(); + * var vname ():DataType; + */ + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + readToken (token); + } + + is_terminated = findCmdTerm (token, true, false); + + if ( isType (token, TOKEN_SEMICOLON) ) + { + makeFlexTag (name, kind); + } + + deleteToken (name); + + return is_terminated; +} + +static void parsePackage (tokenInfo *const token) +{ + tokenInfo *name = NULL; + + if (isKeyword (token, KEYWORD_package)) + readToken(token); + + /* name is optional and can be qualified */ + if (isType (token, TOKEN_IDENTIFIER)) + { + name = newToken (); + copyToken (name, token, true); + readToken (token); + + while (isType (token, TOKEN_PERIOD)) + { + vStringPut (name->string, '.'); + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + { + vStringCat (name->string, token->string); + readToken (token); + } + } + } + + if (isType (token, TOKEN_OPEN_CURLY)) + { + if (name) + makeFlexTag (name, FLEXTAG_PACKAGE); + parseBlock (token, name ? name->string : NULL); + } + + if (name) + deleteToken (name); +} + +static bool parseClass (tokenInfo *const token) +{ + tokenInfo *const name = newToken (); + bool saveIsClass = token->isClass; + + /* + * Variables are defined as: + * private static var lastFaultMessage:Date = new Date( 0 ); + * private static var webRequests:ArrayCollection = new ArrayCollection(); + */ + + if ( isKeyword(token, KEYWORD_class) ) + { + readToken(token); + } + + token->isClass = true; + /* Class name */ + copyToken (name, token, true); + readToken(token); + + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseClass start: token isClass:%d scope:%s name:%s\n" + , token->isClass + , vStringValue(token->scope) + , vStringValue(token->string) + ); + ); + + if (isKeyword (token, KEYWORD_extends)) + { + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + readToken (token); + } + + if (isKeyword (token, KEYWORD_implements)) + { + do + { + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + readToken (token); + } + while (isType (token, TOKEN_COMMA)); + } + + if ( isType (token, TOKEN_OPEN_CURLY) ) + { + makeClassTag (name); + parseBlock (token, name->string); + } + + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseClass end: token isClass:%d scope:%s name:%s\n" + , token->isClass + , vStringValue(token->scope) + , vStringValue(token->string) + ); + ); + token->isClass = saveIsClass; + deleteToken (name); + + return true; +} + +static void parseInterface (tokenInfo *const token) +{ + tokenInfo *const name = newToken (); + bool saveIsClass = token->isClass; + + if (isKeyword(token, KEYWORD_interface)) + readToken(token); + + token->isClass = true; + /* interface name */ + copyToken (name, token, true); + readToken (token); + + /* interfaces can extend multiple interfaces */ + if (isKeyword (token, KEYWORD_extends)) + { + do + { + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + readToken (token); + } + while (isType (token, TOKEN_COMMA)); + } + + if (isType (token, TOKEN_OPEN_CURLY)) + { + makeFlexTag (name, FLEXTAG_INTERFACE); + parseBlock (token, name->string); + } + + token->isClass = saveIsClass; + deleteToken (name); +} + +static bool parseStatement (tokenInfo *const token) +{ + tokenInfo *const name = newToken (); + tokenInfo *const secondary_name = newToken (); + vString * saveScope = vStringNew (); + bool is_public = false; + bool is_class = false; + bool is_terminated = true; + bool is_global = false; + /* bool is_prototype = false; */ + vString * fulltag; + + vStringCopy (saveScope, token->scope); + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseStatement: token isClass:%d scope:%s name:%s\n" + , token->isClass + , vStringValue(token->scope) + , vStringValue(token->string) + ); + ); + /* + * Functions can be named or unnamed. + * This deals with these formats: + * Function + * validFunctionOne = function(a,b) {} + * testlib.validFunctionFive = function(a,b) {} + * var innerThree = function(a,b) {} + * var innerFour = (a,b) {} + * var D2 = secondary_fcn_name(a,b) {} + * var D3 = new Function("a", "b", "return a+b;"); + * Class + * testlib.extras.ValidClassOne = function(a,b) { + * this.a = a; + * } + * Class Methods + * testlib.extras.ValidClassOne.prototype = { + * 'validMethodOne' : function(a,b) {}, + * 'validMethodTwo' : function(a,b) {} + * } + * ValidClassTwo = function () + * { + * this.validMethodThree = function() {} + * // unnamed method + * this.validMethodFour = () {} + * } + * Database.prototype.validMethodThree = Database_getTodaysDate; + */ + + /* skip attributes */ + while (isKeyword (token, KEYWORD_public) || + isKeyword (token, KEYWORD_protected) || + isKeyword (token, KEYWORD_private) || + isKeyword (token, KEYWORD_override) || + isKeyword (token, KEYWORD_static) || + isKeyword (token, KEYWORD_internal) || + isKeyword (token, KEYWORD_native) || + isKeyword (token, KEYWORD_dynamic) || + isKeyword (token, KEYWORD_final)) + { + if (isKeyword(token, KEYWORD_public)) + is_public = true; + + readToken (token); + } + + if (isType(token, TOKEN_KEYWORD)) + { + switch (token->keyword) + { + case KEYWORD_for: + case KEYWORD_while: + case KEYWORD_do: + is_terminated = parseLoop (token); + break; + case KEYWORD_if: + case KEYWORD_else: + case KEYWORD_try: + case KEYWORD_catch: + case KEYWORD_finally: + /* Common semantics */ + is_terminated = parseIf (token); + break; + case KEYWORD_switch: + parseSwitch (token); + break; + case KEYWORD_package: + parsePackage (token); + goto cleanUp; + break; + case KEYWORD_class: + parseClass (token); + goto cleanUp; + break; + case KEYWORD_interface: + parseInterface (token); + goto cleanUp; + break; + case KEYWORD_function: + parseFunction (token); + goto cleanUp; + break; + case KEYWORD_var: + case KEYWORD_const: + is_terminated = parseVar (token, is_public); + goto cleanUp; + break; + default: + readToken(token); + break; + } + } + +nextVar: + copyToken (name, token, true); + + while (! isType (token, TOKEN_CLOSE_CURLY) && + ! isType (token, TOKEN_SEMICOLON) && + ! isType (token, TOKEN_EQUAL_SIGN) && + ! isType (token, TOKEN_COMMA) && + ! isType (token, TOKEN_EOF)) + { + if (isType (token, TOKEN_OPEN_CURLY)) + parseBlock (token, NULL); + + /* Potentially the name of the function */ + if (isType (token, TOKEN_PERIOD)) + { + /* + * Cannot be a global variable is it has dot references in the name + */ + is_global = false; + /* Assume it's an assignment to a global name (e.g. a class) using + * its fully qualified name, so strip the scope. + * FIXME: resolve the scope so we can make more than an assumption. */ + vStringClear (token->scope); + vStringClear (name->scope); + do + { + readToken (token); + if (! isType(token, TOKEN_KEYWORD)) + { + if ( is_class ) + { + addToScope(token, name->string); + } + else + addContext (name, token); + + readToken (token); + } + else if ( isKeyword(token, KEYWORD_prototype) ) + { + /* + * When we reach the "prototype" tag, we infer: + * "BindAgent" is a class + * "build" is a method + * + * function BindAgent( repeatableIdName, newParentIdName ) { + * } + * + * CASE 1 + * Specified function name: "build" + * BindAgent.prototype.build = function( mode ) { + * ignore everything within this function + * } + * + * CASE 2 + * Prototype listing + * ValidClassOne.prototype = { + * 'validMethodOne' : function(a,b) {}, + * 'validMethodTwo' : function(a,b) {} + * } + * + */ + makeClassTag (name); + is_class = true; + /* is_prototype = true; */ + + /* + * There should a ".function_name" next. + */ + readToken (token); + if (isType (token, TOKEN_PERIOD)) + { + /* + * Handle CASE 1 + */ + readToken (token); + if (! isType(token, TOKEN_KEYWORD)) + { + addToScope(token, name->string); + + makeFlexTag (token, FLEXTAG_METHOD); + /* + * We can read until the end of the block / statement. + * We need to correctly parse any nested blocks, but + * we do NOT want to create any tags based on what is + * within the blocks. + */ + token->ignoreTag = true; + /* + * Find to the end of the statement + */ + findCmdTerm (token, false, false); + token->ignoreTag = false; + is_terminated = true; + goto cleanUp; + } + } + else if (isType (token, TOKEN_EQUAL_SIGN)) + { + readToken (token); + if (isType (token, TOKEN_OPEN_CURLY)) + { + /* + * Handle CASE 2 + * + * Creates tags for each of these class methods + * ValidClassOne.prototype = { + * 'validMethodOne' : function(a,b) {}, + * 'validMethodTwo' : function(a,b) {} + * } + */ + parseMethods(token, name); + /* + * Find to the end of the statement + */ + findCmdTerm (token, false, false); + token->ignoreTag = false; + is_terminated = true; + goto cleanUp; + } + } + } + else + readToken (token); + } while (isType (token, TOKEN_PERIOD)); + } + else + readTokenFull (token, true); + + if ( isType (token, TOKEN_OPEN_PAREN) ) + skipArgumentList(token, false); + + if ( isType (token, TOKEN_COLON) ) + { + /* + * Functions are of this form: + * function fname ():ReturnType { + */ + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + readToken (token); + } + + if ( isType (token, TOKEN_OPEN_SQUARE) ) + skipArrayList(token, false); + } + + if ( isType (token, TOKEN_CLOSE_CURLY) ) + { + /* + * Reaching this section without having + * processed an open curly brace indicates + * the statement is most likely not terminated. + */ + is_terminated = false; + goto cleanUp; + } + + if ( isType (token, TOKEN_SEMICOLON) || + isType (token, TOKEN_EOF) || + isType (token, TOKEN_COMMA) ) + { + /* + * Only create variables for global scope + */ + if ( token->nestLevel == 0 && is_global ) + { + /* + * Handles this syntax: + * var g_var2; + */ + makeFlexTag (name, FLEXTAG_VARIABLE); + } + /* + * Statement has ended. + * This deals with calls to functions, like: + * alert(..); + */ + if (isType (token, TOKEN_COMMA)) + { + readToken (token); + goto nextVar; + } + goto cleanUp; + } + + if ( isType (token, TOKEN_EQUAL_SIGN) ) + { + readToken (token); + + if ( isKeyword (token, KEYWORD_function) ) + { + readToken (token); + + if (! isType (token, TOKEN_KEYWORD) && + ! isType (token, TOKEN_OPEN_PAREN)) + { + /* + * Functions of this format: + * var D2A = function theAdd(a, b) + * { + * return a+b; + * } + * Are really two separate defined functions and + * can be referenced in two ways: + * alert( D2A(1,2) ); // produces 3 + * alert( theAdd(1,2) ); // also produces 3 + * So it must have two tags: + * D2A + * theAdd + * Save the reference to the name for later use, once + * we have established this is a valid function we will + * create the secondary reference to it. + */ + copyToken (secondary_name, token, true); + readToken (token); + } + + if ( isType (token, TOKEN_OPEN_PAREN) ) + skipArgumentList(token, false); + + if (isType (token, TOKEN_OPEN_CURLY)) + { + /* + * This will be either a function or a class. + * We can only determine this by checking the body + * of the function. If we find a "this." we know + * it is a class, otherwise it is a function. + */ + if ( token->isClass ) + { + makeFlexTag (name, FLEXTAG_METHOD); + if ( vStringLength(secondary_name->string) > 0 ) + makeFunctionTag (secondary_name); + parseBlock (token, name->string); + } + else + { + parseBlock (token, name->string); + makeFunctionTag (name); + + if ( vStringLength(secondary_name->string) > 0 ) + makeFunctionTag (secondary_name); + } + } + } + else if (isType (token, TOKEN_OPEN_PAREN)) + { + /* + * Handle nameless functions + * this.method_name = () {} + */ + skipArgumentList(token, false); + + if (isType (token, TOKEN_OPEN_CURLY)) + { + /* + * Nameless functions are only setup as methods. + */ + makeFlexTag (name, FLEXTAG_METHOD); + parseBlock (token, name->string); + } + } + else if (isType (token, TOKEN_OPEN_CURLY)) + { + /* + * Creates tags for each of these class methods + * ValidClassOne.prototype = { + * 'validMethodOne' : function(a,b) {}, + * 'validMethodTwo' : function(a,b) {} + * } + */ + parseMethods(token, name); + /* Here we should be at the end of the block, on the close curly. + * If so, read the next token not to confuse that close curly with + * the end of the current statement. */ + if (isType (token, TOKEN_CLOSE_CURLY)) + { + readTokenFull(token, true); + is_terminated = isType (token, TOKEN_SEMICOLON); + } + } + else if (isKeyword (token, KEYWORD_new)) + { + readToken (token); + if ( isKeyword (token, KEYWORD_function) || + isKeyword (token, KEYWORD_capital_function) || + isKeyword (token, KEYWORD_object) || + isKeyword (token, KEYWORD_capital_object) ) + { + if ( isKeyword (token, KEYWORD_object) || + isKeyword (token, KEYWORD_capital_object) ) + is_class = true; + + readToken (token); + if ( isType (token, TOKEN_OPEN_PAREN) ) + skipArgumentList(token, true); + + if (isType (token, TOKEN_SEMICOLON)) + { + if ( token->nestLevel == 0 ) + { + if ( is_class ) + { + makeClassTag (name); + } else { + makeFunctionTag (name); + } + } + } + else if (isType (token, TOKEN_CLOSE_CURLY)) + is_terminated = false; + } + } + else if (! isType (token, TOKEN_KEYWORD)) + { + /* + * Only create variables for global scope + */ + if ( token->nestLevel == 0 && is_global ) + { + /* + * A pointer can be created to the function. + * If we recognize the function/class name ignore the variable. + * This format looks identical to a variable definition. + * A variable defined outside of a block is considered + * a global variable: + * var g_var1 = 1; + * var g_var2; + * This is not a global variable: + * var g_var = function; + * This is a global variable: + * var g_var = different_var_name; + */ + fulltag = vStringNew (); + if (vStringLength (token->scope) > 0) + { + vStringCopy(fulltag, token->scope); + vStringPut (fulltag, '.'); + vStringCat (fulltag, token->string); + } + else + { + vStringCopy(fulltag, token->string); + } + if ( ! stringListHas(FunctionNames, vStringValue (fulltag)) && + ! stringListHas(ClassNames, vStringValue (fulltag)) ) + { + makeFlexTag (name, FLEXTAG_VARIABLE); + } + vStringDelete (fulltag); + } + } + } + /* if we aren't already at the cmd end, advance to it and check whether + * the statement was terminated */ + if (! isType (token, TOKEN_CLOSE_CURLY) && + ! isType (token, TOKEN_SEMICOLON)) + { + /* + * Statements can be optionally terminated in the case of + * statement prior to a close curly brace as in the + * document.write line below: + * + * function checkForUpdate() { + * if( 1==1 ) { + * document.write("hello from checkForUpdate ") + * } + * return 1; + * } + */ + is_terminated = findCmdTerm (token, true, true); + /* if we're at a comma, try and read a second var */ + if (isType (token, TOKEN_COMMA)) + { + readToken (token); + goto nextVar; + } + } + +cleanUp: + vStringCopy(token->scope, saveScope); + deleteToken (name); + deleteToken (secondary_name); + vStringDelete(saveScope); + + return is_terminated; +} + +static bool parseLine (tokenInfo *const token) +{ + bool is_terminated = true; + /* + * Detect the common statements, if, while, for, do, ... + * This is necessary since the last statement within a block "{}" + * can be optionally terminated. + * + * If the statement is not terminated, we need to tell + * the calling routine to prevent reading an additional token + * looking for the end of the statement. + */ + + if (isType(token, TOKEN_KEYWORD)) + { + switch (token->keyword) + { + case KEYWORD_for: + case KEYWORD_while: + case KEYWORD_do: + is_terminated = parseLoop (token); + break; + case KEYWORD_if: + case KEYWORD_else: + case KEYWORD_try: + case KEYWORD_catch: + case KEYWORD_finally: + /* Common semantics */ + is_terminated = parseIf (token); + break; + case KEYWORD_switch: + parseSwitch (token); + break; + case KEYWORD_return: + readToken (token); + is_terminated = parseLine (token); + break; + case KEYWORD_function: + parseFunction (token); + break; + case KEYWORD_import: + is_terminated = parseImport (token); + /* to properly support unterminated imports at top level, + * recurse here because parseActionScript() will *always* + * advance to avoid ever getting stuck. */ + if (! is_terminated) + return parseLine (token); + break; + default: + is_terminated = parseStatement (token); + break; + } + } + else + { + /* + * Special case where single line statements may not be + * SEMICOLON terminated. parseBlock needs to know this + * so that it does not read the next token. + */ + is_terminated = parseStatement (token); + } + return is_terminated; +} + +static bool parseCDATA (tokenInfo *const token) +{ + if (isType (token, TOKEN_LESS_THAN)) + { + /* + * Handle these tags + * <![CDATA[ + * ... + * ]]> + */ + readToken (token); + if (isType (token, TOKEN_EXCLAMATION)) + { + readToken (token); + if (isType (token, TOKEN_OPEN_SQUARE)) + { + readToken (token); + if (isKeyword (token, KEYWORD_cdata)) + { + readToken (token); + if (isType (token, TOKEN_OPEN_SQUARE)) + { + parseActionScript (token, true); + if (isType (token, TOKEN_CLOSE_SQUARE)) + { + readToken (token); + if (isType (token, TOKEN_CLOSE_SQUARE)) + { + readToken (token); + } + } + } + } + } + } + } + else + { + parseActionScript (token, false); + } + return true; +} + +static bool parseNamespace (tokenInfo *const token) +{ + /* + * If we have found a <, we know it is not a TOKEN_OPEN_MXML + * but it could potentially be a different namespace. + * This means it will also have a closing tag, which will + * mess up the parser if we do not properly recurse + * through these tags. + */ + + if (isType (token, TOKEN_LESS_THAN)) + { + readToken (token); + } + + /* + * Check if we have reached a other namespace tag + * <views:Object ... /> + * or + * <views:Object ... > + * </views:Object> + */ + if (isType (token, TOKEN_IDENTIFIER)) + { + readToken (token); + if (isType (token, TOKEN_COLON)) + { + readToken (token); + if ( ! isType (token, TOKEN_IDENTIFIER)) + { + return true; + } + } + else + { + return true; + } + } + else + { + return true; + } + + /* + * Confirmed we are inside a namespace tag, so + * process it until the close tag. + * + * But also check for new tags, which will either + * be recursive namespaces or MXML tags + */ + do + { + if (isType (token, TOKEN_LESS_THAN)) + { + parseNamespace (token); + readToken (token); + } + if (isType (token, TOKEN_OPEN_MXML)) + { + parseMXML (token); + } + else + { + readToken (token); + } + } while (! (isType (token, TOKEN_CLOSE_SGML) || + isType (token, TOKEN_CLOSE_MXML) || + isEOF (token)) ); + return true; +} + +static bool parseMXML (tokenInfo *const token) +{ + tokenInfo *const name = newToken (); + tokenInfo *const type = newToken (); + bool inside_attributes = true; + /* + * Detect the common statements, if, while, for, do, ... + * This is necessary since the last statement within a block "{}" + * can be optionally terminated. + * + * If the statement is not terminated, we need to tell + * the calling routine to prevent reading an additional token + * looking for the end of the statement. + */ + + readToken (token); + + if (isKeyword (token, KEYWORD_script)) + { + /* + * These tags can be of this form: + * <mx:Script src="filename.as" /> + */ + do + { + readToken (token); + } while (! (isType (token, TOKEN_CLOSE_SGML) || + isType (token, TOKEN_CLOSE_MXML) || + isType (token, TOKEN_GREATER_THAN) || + isEOF (token)) ); + + if (isType (token, TOKEN_CLOSE_MXML)) + { + /* + * We have found a </mx:type> tag + * Finish reading the "type" and ">" + */ + readToken (token); + readToken (token); + goto cleanUp; + } + if (isType (token, TOKEN_CLOSE_SGML)) + { + /* + * We have found a <mx:Script src="filename.as" /> + */ + goto cleanUp; + } + + /* + * This is a beginning of an embedded script. + * These typically are of this format: + * <mx:Script> + * <![CDATA[ + * ... ActionScript ... + * ]]> + * </mx:Script> + */ + readToken (token); + parseCDATA (token); + + readToken (token); + if (isType (token, TOKEN_CLOSE_MXML)) + { + /* + * We have found a </mx:type> tag + * Finish reading the "type" and ">" + */ + readToken (token); + readToken (token); + } + goto cleanUp; + } + + copyToken (type, token, true); + + readToken (token); + do + { + if (isType (token, TOKEN_GREATER_THAN)) + { + inside_attributes = false; + } + if (isType (token, TOKEN_LESS_THAN)) + { + parseNamespace (token); + readToken (token); + } + else if (isType (token, TOKEN_OPEN_MXML)) + { + parseMXML (token); + readToken (token); + } + else if (inside_attributes && (isKeyword (token, KEYWORD_id) || isKeyword (token, KEYWORD_name))) + { + if (vStringLength(name->string) == 0 ) + { + /* + * If we have already created the tag based on either "name" + * or "id" do not do it again. + */ + readToken (token); + readToken (token); + + copyToken (name, token, true); + addToScope (name, type->string); + makeMXTag (name); + } + else + { + readToken (token); + } + } + else + { + readToken (token); + } + } while (! (isType (token, TOKEN_CLOSE_SGML) || + isType (token, TOKEN_CLOSE_MXML) || + isEOF (token)) ); + + if (isType (token, TOKEN_CLOSE_MXML)) + { + /* + * We have found a </mx:type> tag + * Finish reading the "type" and ">" + */ + readToken (token); + readToken (token); + } + +cleanUp: + deleteToken (name); + deleteToken (type); + return true; +} + +static bool parseActionScript (tokenInfo *const token, bool readNext) +{ + LastTokenType = TOKEN_UNDEFINED; + + do + { + if (! readNext) + readNext = true; + else + readToken (token); + + if (isType (token, TOKEN_LESS_THAN)) + { + /* + * Handle these tags + * <![CDATA[ + * ... + * ]]> + */ + readToken (token); + if (isType (token, TOKEN_EQUAL_SIGN)) + { + if (isType (token, TOKEN_OPEN_SQUARE)) + { + readToken (token); + if (isKeyword (token, KEYWORD_cdata)) + { + readToken (token); + } + } + } + } + if (isType (token, TOKEN_CLOSE_SQUARE)) + { + /* + * Handle these tags + * <![CDATA[ + * ... + * ]]> + */ + readToken (token); + if (isType (token, TOKEN_CLOSE_SQUARE)) + { + readToken (token); + if (isType (token, TOKEN_GREATER_THAN)) + { + return true; + } + } + } + else if (isType (token, TOKEN_CLOSE_MXML)) + { + /* + * Read the Script> tags + */ + readToken (token); + readToken (token); + return true; + } + else if (isType (token, TOKEN_OPEN_MXML)) + { + parseMXML (token); + } + else + { + parseLine (token); + } + } while (!isEOF (token)); + return true; +} + +static void parseFlexFile (tokenInfo *const token) +{ + do + { + readToken (token); + + if (isType (token, TOKEN_OPEN_MXML)) + { + parseMXML (token); + } + else if (isType (token, TOKEN_LESS_THAN)) + { + readToken (token); + if (isType (token, TOKEN_QUESTION_MARK)) + { + /* + * <?xml version="1.0" encoding="utf-8"?> + */ + readToken (token); + while (! (isType (token, TOKEN_QUESTION_MARK) || isEOF (token))) + { + readToken (token); + } + readToken (token); + } + else if (isKeyword (token, KEYWORD_NONE)) + { + /* + * This is a simple XML tag, read until the closing statement + * <something .... > + * </something> + */ + readToken (token); + while (! (isType (token, TOKEN_GREATER_THAN) || isEOF (token))) + { + readToken (token); + } + } + } + else + { + parseActionScript (token, false); + } + } while (!isEOF (token)); +} + +static void initialize (const langType language) +{ + Assert (ARRAY_SIZE (FlexKinds) == FLEXTAG_COUNT); + Lang_flex = language; +} + +static void findFlexTags (void) +{ + tokenInfo *const token = newToken (); + + NextToken = NULL; + ClassNames = stringListNew (); + FunctionNames = stringListNew (); + + parseFlexFile (token); + + stringListDelete (ClassNames); + stringListDelete (FunctionNames); + ClassNames = NULL; + FunctionNames = NULL; + deleteToken (token); +} + +/* Create parser definition structure */ +extern parserDefinition* FlexParser (void) +{ + static const char *const extensions [] = { "as", "mxml", NULL }; + parserDefinition *const def = parserNew ("Flex"); + def->extensions = extensions; + /* + * New definitions for parsing instead of regex + */ + def->kindTable = FlexKinds; + def->kindCount = ARRAY_SIZE (FlexKinds); + def->parser = findFlexTags; + def->initialize = initialize; + def->keywordTable = FlexKeywordTable; + def->keywordCount = ARRAY_SIZE (FlexKeywordTable); + + return def; +} Modified: src/symbols.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -718,6 +718,7 @@ static void add_top_level_items(GeanyDocument *doc) case GEANY_FILETYPES_AS: { tag_list_add_groups(tag_store, + &(tv_iters.tag_externvar), _("Imports"), ICON_NAMESPACE, &(tv_iters.tag_namespace), _("Package"), ICON_NAMESPACE, &(tv_iters.tag_interface), _("Interfaces"), ICON_STRUCT, &(tv_iters.tag_class), _("Classes"), ICON_CLASS, Modified: src/tagmanager/tm_parser.c 15 lines changed, 9 insertions(+), 6 deletions(-) =================================================================== @@ -371,14 +371,16 @@ static TMParserMapEntry map_VALA[] = { /* not in universal-ctags */ static TMParserMapEntry map_ACTIONSCRIPT[] = { {'f', tm_tag_function_t}, - {'l', tm_tag_field_t}, - {'v', tm_tag_variable_t}, - {'m', tm_tag_macro_t}, {'c', tm_tag_class_t}, {'i', tm_tag_interface_t}, - {'p', tm_tag_package_t}, - {'o', tm_tag_other_t}, - {'r', tm_tag_prototype_t}, + {'P', tm_tag_package_t}, + {'m', tm_tag_method_t}, + {'p', tm_tag_member_t}, + {'v', tm_tag_variable_t}, + {'l', tm_tag_variable_t}, + {'C', tm_tag_macro_t}, + {'I', tm_tag_externvar_t}, + {'x', tm_tag_other_t}, }; /* not in universal-ctags */ @@ -765,6 +767,7 @@ gboolean tm_parser_has_full_context(TMParserType lang) switch (lang) { /* These parsers include full hierarchy in the tag scope, separated by tm_parser_context_separator() */ + case TM_PARSER_ACTIONSCRIPT: case TM_PARSER_C: case TM_PARSER_CPP: case TM_PARSER_CSHARP: Modified: tests/ctags/Makefile.am 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -15,6 +15,13 @@ test_sources = \ 3470609.js \ 3526726.tex \ 68hc11.asm \ + actionscript/as-first-token.as \ + actionscript/classes.as \ + actionscript/const2.as \ + actionscript/const.as \ + actionscript/method-attributes.as \ + actionscript/packages.as \ + actionscript/sampler.as \ angle_bracket.cpp \ anonymous_functions.php \ arraylist.js \ Modified: tests/ctags/actionscript/as-first-token.as 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1 @@ +function f1():void {} Modified: tests/ctags/actionscript/as-first-token.as.tags 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,2 @@ +# format=tagmanager +f1�16�0 Modified: tests/ctags/actionscript/classes.as 16 lines changed, 16 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,16 @@ +package { + class C1 { + public function m1():Boolean { return 0; } + } + class C2 extends C1 {} + class C3 {} + interface I1 {} + interface I2 {} + interface I3 extends I1, I2 {} + interface I4 extends I3 {} + class C4 implements I1 {} + class C5 extends C3 implements I1 {} + class C6 extends C3 implements I1, I2 {} + + dynamic class C7{} +} Modified: tests/ctags/actionscript/classes.as.tags 13 lines changed, 13 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,13 @@ +# format=tagmanager +C1�1�0 +C2�1�0 +C3�1�0 +C4�1�0 +C5�1�0 +C6�1�0 +C7�1�0 +I1�32�0 +I2�32�0 +I3�32�0 +I4�32�0 +m1�128�C1�0 Modified: tests/ctags/actionscript/const.as 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,8 @@ +// https://www.oreilly.com/library/view/essential-actionscript-30/0596526946/c… +public class AlarmClock { + public static const MODE_VISUAL = 1; + public static const MODE_AUDIO = 2; + public static const MODE_BOTH = 3; + + private var mode = AlarmClock.MODE_AUDIO; +} Modified: tests/ctags/actionscript/const.as.tags 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,6 @@ +# format=tagmanager +AlarmClock�1�0 +MODE_AUDIO�65536�AlarmClock�0 +MODE_BOTH�65536�AlarmClock�0 +MODE_VISUAL�65536�AlarmClock�0 +mode�16384�AlarmClock�0 Modified: tests/ctags/actionscript/const2.as 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,7 @@ +// https://help.adobe.com/en_US/FlashPlatform/reference/actionscript/3/stateme… +const MIN_AGE:int = 21; + +const product_array:Array = new Array("Studio", "Dreamweaver", "Flash", "ColdFusion", "Contribute", "Breeze"); +product_array.push("Flex"); // array operations are allowed +product_array = ["Other"]; // assignment is an error +trace(product_array); Modified: tests/ctags/actionscript/const2.as.tags 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,3 @@ +# format=tagmanager +MIN_AGE�65536�0 +product_array�65536�0 Modified: tests/ctags/actionscript/method-attributes.as 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,12 @@ +/* Not sure it's really valid, but the goal is to check not choking on + * attributes, so so long as it's valid attributes it's fine */ +class C { + public function f1():void {} + private function f2():void {} + protected function f3():void {} + internal function f4():void {} + public function f5():void {} + public override function f6():void {} + final function f7():void {} + native function f8():void {} +} Modified: tests/ctags/actionscript/method-attributes.as.tags 10 lines changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,10 @@ +# format=tagmanager +C�1�0 +f1�128�C�0 +f2�128�C�0 +f3�128�C�0 +f4�128�C�0 +f5�128�C�0 +f6�128�C�0 +f7�128�C�0 +f8�128�C�0 Modified: tests/ctags/actionscript/packages.as 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,9 @@ +package P1 {} +package P2 { + function f1() {} +} +package P3 { + class C1 {} +} +package qualified.test . pkg { +} Modified: tests/ctags/actionscript/packages.as.tags 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,7 @@ +# format=tagmanager +C1�1�P3�0 +P1�512�0 +P2�512�0 +P3�512�0 +f1�16�P2�0 +qualified.test.pkg�512�0 Modified: tests/ctags/actionscript/sampler.as 66 lines changed, 66 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,66 @@ +// https://help.adobe.com/en_US/FlashPlatform/reference/actionscript/3/flash/s… +package +{ + import flash.sampler.* + import flash.system.* + import flash.utils.* + import flash.display.Sprite + public class sampleTypes extends Sprite + { + var b:Boolean = true + public function sampleTypes() { + flash.sampler.startSampling(); + for(var i:int=0;i<10000;i++) + new Object(); + + var cpuSamples:Array=[]; + var newSamples:Array=[]; + var delSamples:Array=[]; + var ids:Array=[] + + var lastTime:Number=0; + for each(var s:Sample in getSamples()) { + + assert(s.time > 0); // positive + assert(Math.floor(s.time) == s.time, s.time); // integral + assert(s.time >= lastTime, s.time + ":" + lastTime); // ascending + assert(s.stack == null || s.stack is Array) + if(s.stack) { + assert(s.stack[0] is StackFrame); + assert(s.stack[0].name is String); + } + + if(s is NewObjectSample) { + var nos = NewObjectSample(s); + assert(s.id > 0, s.id); + assert(s.type is Class, getQualifiedClassName(s.type)); + newSamples.push(s); + ids[s.id] = "got one"; + } else if(s is DeleteObjectSample) { + var dos = DeleteObjectSample(s); + delSamples.push(s); + assert(ids[dos.id] == "got one"); + } else if(s is Sample) + cpuSamples.push(s); + else { + assert(false); + } + lastTime = s.time; + } + + trace(b) + trace(newSamples.length > 0) + trace(cpuSamples.length > 0) + trace(delSamples.length > 0) + + } + + private function assert(e:Boolean, mess:String=null):void { + b = e && b; + if(true && !e) { + if(mess) trace(mess); + trace(new Error().getStackTrace()); + } + } + } +} Modified: tests/ctags/actionscript/sampler.as.tags 16 lines changed, 16 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,16 @@ +# format=tagmanager +assert�128�sampleTypes�0 +b�16384�sampleTypes�0 +cpuSamples�16384�sampleTypes.sampleTypes�0 +delSamples�16384�sampleTypes.sampleTypes�0 +dos�16384�sampleTypes.sampleTypes�0 +flash.display.Sprite�32768�0 +flash.sampler.*�32768�0 +flash.system.*�32768�0 +flash.utils.*�32768�0 +ids�16384�sampleTypes.sampleTypes�0 +lastTime�16384�sampleTypes.sampleTypes�0 +newSamples�16384�sampleTypes.sampleTypes�0 +nos�16384�sampleTypes.sampleTypes�0 +sampleTypes�1�0 +sampleTypes�128�sampleTypes�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 122374: Windows installer: Install GTK translations only if selected
by Enrico Tröger 23 Apr '19

23 Apr '19

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Mon, 22 Apr 2019 20:37:51 UTC Commit: 1223743b70a234d57787c12dad98427861acab60 https://github.com/geany/geany/commit/1223743b70a234d57787c12dad98427861aca… Log Message: ----------- Windows installer: Install GTK translations only if selected Closes #2090. Modified Paths: -------------- geany.nsi.in Modified: geany.nsi.in 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -234,7 +234,7 @@ Section "GTK ${GTK_VERSION} Runtime Environment" SEC06 SetOutPath "$INSTDIR\lib" File /r "gtk\lib\*" SetOutPath "$INSTDIR\share" - File /r "gtk\share\*" + File /r /x "*.mo" "gtk\share\*" SectionEnd !endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 0504d1: Update of Japanese translation
by Frank Lanitz 22 Apr '19

22 Apr '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 22 Apr 2019 15:44:22 UTC Commit: 0504d1631665b5394c3e852e40e5925a55a1af8f https://github.com/geany/geany/commit/0504d1631665b5394c3e852e40e5925a55a1a… Log Message: ----------- Update of Japanese translation Modified Paths: -------------- po/ja.po Modified: po/ja.po 219 lines changed, 110 insertions(+), 109 deletions(-) =================================================================== @@ -1,16 +1,16 @@ # Japanese translations for geany package. -# Copyright (C) 2006 The Geany contributors. +# Copyright (C) 2006-2019 The Geany contributors. # This file is distributed under the same license as the geany package. # Tarot Osuji <tarot(a)sdf.lonestar.org>, 2008. -# Chikahiro Masami <cmasa.z321(a)gmail.com>, 2008-2018 +# Chikahiro Masami <cmasa.z321(a)gmail.com>, 2008-2019 # msgid "" msgstr "" -"Project-Id-Version: Geany 1.34\n" +"Project-Id-Version: Geany 1.35\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-15 17:13+0200\n" "PO-Revision-Date: 2014-11-09 13:26+0900\n" -"Last-Translator: Chikahiro Masami <masami(a)linux-lhx4.site>\n" +"Last-Translator: Chikahiro Masami <cmasa.z321(a)gmail.com>\n" "Language-Team: Japanese <ja(a)li.org>\n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -67,15 +67,15 @@ msgstr "関数の説明を挿入(_F)" #: ../data/geany.glade.h:8 msgid "Insert Mu_ltiline Comment" -msgstr "複数行コメントを挿入(_M)" +msgstr "複数行コメントを挿入(_L)" #: ../data/geany.glade.h:9 msgid "_More" msgstr "その他(_M)" #: ../data/geany.glade.h:10 msgid "Insert File _Header" -msgstr "ファイルのヘッダを挿入(_H)" +msgstr "ファイルヘッダを挿入(_H)" #: ../data/geany.glade.h:11 msgid "Insert _GPL Notice" @@ -99,31 +99,31 @@ msgstr "\"include <...>\" 文を挿入(_I)" #: ../data/geany.glade.h:16 ../src/keybindings.c:514 msgid "Insert Alternative _White Space" -msgstr "複数の空白を挿入(_I)" +msgstr "代替空白を挿入(_W)" #: ../data/geany.glade.h:17 msgid "_Search" msgstr "検索(_S)" #: ../data/geany.glade.h:18 msgid "Open Selected F_ile" -msgstr "選択されたファイルを開く(_I)" +msgstr "選択したファイルを開く(_I)" #: ../data/geany.glade.h:19 ../src/symbols.c:2615 msgid "Find _Usage" -msgstr "使用箇所を検索(_U)" +msgstr "使い方を検索(_U)" #: ../data/geany.glade.h:20 ../src/symbols.c:2620 msgid "Find _Document Usage" -msgstr "文書内で使用箇所を検索(_D)" +msgstr "文書の使い方を検索(_D)" #: ../data/geany.glade.h:21 msgid "Go to Symbol Defini_tion" -msgstr "タグ定義に移動(_T)" +msgstr "シンボル定義に移動(_T)" #: ../data/geany.glade.h:22 msgid "Conte_xt Action" -msgstr "ユーザ定義コマンド(_X)" +msgstr "コンテキストアクション(_X)" #. Column legend: #. * [0] = Filetype constant (GEANY_FILETYPES_*) @@ -176,18 +176,18 @@ msgstr "最後のセッションからファイルを読み込む" #: ../data/geany.glade.h:33 msgid "Opens at startup the files from the last session" -msgstr "起動時に最後のセッションからファイルを開く" +msgstr "最後のセッションから起動時にファイルを開く" #: ../data/geany.glade.h:34 msgid "Load virtual terminal support" -msgstr "仮想端末サポートを読み込む" +msgstr "仮想端末サポートをロードする" #: ../data/geany.glade.h:35 msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" msgstr "" -"起動時に仮想端末エミュレーション(VTE)を読み込むかどうか指定します。不要なら無" +"起動時に仮想端末エミュレーション(VTE)をロードするかどうか指定します。不要なら無" "効にできます。" #: ../data/geany.glade.h:36 @@ -242,7 +242,7 @@ msgstr "プロジェクトファイル:" #: ../data/geany.glade.h:48 msgid "Path to start in when opening project files" -msgstr "プロジェクトファイルを開くときに使用するパスです。" +msgstr "プロジェクトファイルを開くときに使用するパス" #: ../data/geany.glade.h:49 msgid "Extra plugin path:" @@ -254,17 +254,17 @@ msgid "" "configuration directory. The path entered here will be searched additionally " "for plugins. Leave blank to disable." msgstr "" -"Geany はインストール先と、環境設定が保存されているパスからプラグインを検索し" -"ます。ここで指定したパスからもプラグインを検索するようになります。指定しない" -"ときは空欄のままにしてください。" +"Geany は既定値ではインストール先ディレクトリと、環境設定ディレクトリから" +"プラグインを検索します。ここで指定したパスからもプラグインを検索するよう" +"になります。指定しないときは空欄のままにしてください。" #: ../data/geany.glade.h:51 msgid "Paths" msgstr "パス" #: ../data/geany.glade.h:52 msgid "Startup" -msgstr "起動/終了" +msgstr "起動" #: ../data/geany.glade.h:53 msgid "Beep on errors or when compilation has finished" @@ -286,7 +286,7 @@ msgid "" "new status message arrives" msgstr "" "新しいステータスメッセージを受けとったとき、ステータスメッセージリストに切り" -"替えます。" +"替えます(メモウィンドウの下部)。" #: ../data/geany.glade.h:57 msgid "Suppress status messages in the status bar" @@ -297,8 +297,8 @@ msgid "" "Removes all messages from the status bar. The messages are still displayed " "in the status messages window." msgstr "" -"ステータスバーのすべてのメッセージを消去します。メッセージはステータスメッ" -"セージリストに残っています。" +"ステータスバーからすべてのメッセージを消去します。メッセージは" +"ステータスメッセージリストに残っています。" #: ../data/geany.glade.h:59 msgid "Auto-focus widgets (focus follows mouse)" @@ -358,7 +358,7 @@ msgstr "" #: ../data/geany.glade.h:70 msgid "Use the current file's directory for Find in Files" -msgstr "検索に現在のディレクトリのファイルを使用" +msgstr "複数ファイルから検索で現在のファイルのディレクトリを使用" #: ../data/geany.glade.h:71 msgid "Search" @@ -377,7 +377,7 @@ msgstr "" #: ../data/geany.glade.h:74 msgid "Store project file inside the project base directory" -msgstr "プロジェクトファイルをプロジェクトの基本ディレクトリに保存しますか?" +msgstr "プロジェクトファイルをプロジェクトのディレクトリに保存する" #: ../data/geany.glade.h:75 msgid "" @@ -409,19 +409,19 @@ msgstr "全般" #: ../data/geany.glade.h:79 msgid "Show symbol list" -msgstr "シンボルリストの表示" +msgstr "シンボルリストを表示" #: ../data/geany.glade.h:80 msgid "Toggle the symbol list on and off" msgstr "シンボルリストのオン／オフを切り替える" #: ../data/geany.glade.h:81 msgid "Default symbol sorting mode" -msgstr "デフォルトのシンボルソートモード" +msgstr "既定のシンボルソートモード" #: ../data/geany.glade.h:82 msgid "Default sorting mode:" -msgstr "デフォルトのソートモード:" +msgstr "既定のソートモード:" #: ../data/geany.glade.h:83 ../src/stash.c:1169 msgid "Name" @@ -525,13 +525,13 @@ msgstr "ファイルタブは右側に配置されます" #: ../data/geany.glade.h:107 msgid "Next to current" -msgstr "現在のタブの次" +msgstr "現在のタブの隣" #: ../data/geany.glade.h:108 msgid "" "Whether to place file tabs next to the current tab rather than at the edges " "of the notebook" -msgstr "ファイルタブを現在のタブの次に置くかメモの端にするかを指定" +msgstr "ファイルタブを現在のタブの隣に置くかメモの端にするかを指定" #: ../data/geany.glade.h:109 msgid "Double-clicking hides all additional widgets" @@ -583,15 +583,15 @@ msgstr "システム標準(_D)" #: ../data/geany.glade.h:121 msgid "Images _and text" -msgstr "画像とテキスト(_A)" +msgstr "画像と文字(_A)" #: ../data/geany.glade.h:122 msgid "_Images only" msgstr "画像のみ(_I)" #: ../data/geany.glade.h:123 msgid "_Text only" -msgstr "テキストのみ(_T)" +msgstr "文字のみ(_T)" #: ../data/geany.glade.h:124 msgid "Icon style" @@ -685,7 +685,7 @@ msgstr "" #: ../data/geany.glade.h:141 msgid "Use indicators to show compile errors" -msgstr "インジケータをコンパイルエラーの表示に使う" +msgstr "コンパイルエラーの表示にインジケータを使う" #: ../data/geany.glade.h:142 msgid "" @@ -832,11 +832,11 @@ msgstr "" #: ../data/geany.glade.h:171 msgid "XML/HTML tag auto-closing" -msgstr "XML/HTML タグの自動補完" +msgstr "XML/HTML 終了タグの自動補完" #: ../data/geany.glade.h:172 msgid "Insert matching closing tag for XML/HTML" -msgstr "XML/HTMLタグの対応を確認して挿入" +msgstr "XML/HTML 終了タグを自動挿入" #: ../data/geany.glade.h:173 msgid "Automatic continuation of multi-line comments" @@ -847,12 +847,12 @@ msgid "" "Continue automatically multi-line comments in languages like C, C++ and Java " "when a new line is entered inside such a comment" msgstr "" -"コメント記述中にEnterキーを押したとき、C, C++, Java言語のような複数行コメント" +"コメント記述中にEnterキーを押したとき、C, C++, Java言語の複数行コメント" "を自動継続します" #: ../data/geany.glade.h:175 msgid "Autocomplete symbols" -msgstr "自動補完シンボル" +msgstr "シンボルを自動補完" #: ../data/geany.glade.h:176 msgid "" @@ -978,7 +978,7 @@ msgstr "インデント位置を表示" #: ../data/geany.glade.h:203 msgid "Shows small dotted lines to help you to use the right indentation" -msgstr "右インデント位置を示すために破線を表示します" +msgstr "右インデント位置を示す破線を表示します" #: ../data/geany.glade.h:204 msgid "Show white space" @@ -1024,7 +1024,7 @@ msgstr "文書の最後の行でさらに1ページ分スクロールするか #: ../data/geany.glade.h:214 msgid "Lines visible _around the cursor:" -msgstr "" +msgstr "カーソルの周囲に表示する行数(_A):" #: ../data/geany.glade.h:215 msgid "Display" @@ -1136,19 +1136,19 @@ msgstr "コマンドラインのファイル名から新しいファイルを作 #: ../data/geany.glade.h:238 msgid "Default end of line characters:" -msgstr "デフォルトの改行文字:" +msgstr "既定の改行文字:" #: ../data/geany.glade.h:239 msgid "New files" msgstr "新規ファイル" #: ../data/geany.glade.h:240 msgid "Default encoding (new files):" -msgstr "デフォルトのエンコーディング（新規ファイル）:" +msgstr "標準のエンコーディング（新規ファイル）:" #: ../data/geany.glade.h:241 msgid "Sets the default encoding for newly created files" -msgstr "新しく作成するファイルのデフォルトのエンコーディングを設定します" +msgstr "新しく作成するファイルの標準のエンコーディングを設定します" #: ../data/geany.glade.h:242 msgid "Use fixed encoding when opening non-Unicode files" @@ -1297,7 +1297,7 @@ msgstr "開発者の email アドレス" #: ../data/geany.glade.h:274 msgid "Initials of the developer name" -msgstr "開発者の頭文字" +msgstr "開発者のイニシャル" #: ../data/geany.glade.h:275 msgid "Initial version:" @@ -1325,7 +1325,7 @@ msgstr "メールアドレス:" #: ../data/geany.glade.h:281 msgid "Initials:" -msgstr "頭文字:" +msgstr "イニシャル:" #: ../data/geany.glade.h:282 msgid "The name of the developer" @@ -1453,7 +1453,7 @@ msgstr "" #: ../data/geany.glade.h:308 msgid "Use native GTK printing" -msgstr "ネイティブな GTK の印刷機能を使用" +msgstr "ネイティブ GTK の印刷機能を使用" #: ../data/geany.glade.h:309 msgid "Printing" @@ -1634,7 +1634,7 @@ msgstr "別名で保存...(_A)" #: ../data/geany.glade.h:349 msgid "Sa_ve All" -msgstr "すべて保存(_L)" +msgstr "すべて保存(_V)" #: ../data/geany.glade.h:350 ../src/document.c:1655 ../src/document.c:3616 #: ../src/sidebar.c:717 @@ -1655,19 +1655,19 @@ msgstr "印刷...(_P)" #: ../data/geany.glade.h:354 ../src/notebook.c:495 msgid "Close Ot_her Documents" -msgstr "他のファイルを閉じる(_H)" +msgstr "他の文書を閉じる(_H)" #: ../data/geany.glade.h:355 ../src/notebook.c:507 msgid "C_lose All" msgstr "すべて閉じる(_L)" #: ../data/geany.glade.h:356 msgid "Co_mmands" -msgstr "コマンド(_C)" +msgstr "コマンド(_M)" #: ../data/geany.glade.h:357 ../src/keybindings.c:437 msgid "Cu_t Current Line(s)" -msgstr "現在の行を切り取り(_C)" +msgstr "現在の行を切り取り(_T)" #: ../data/geany.glade.h:358 ../src/keybindings.c:434 msgid "_Copy Current Line(s)" @@ -1679,15 +1679,15 @@ msgstr "現在の行を削除(_D)" #: ../data/geany.glade.h:360 ../src/keybindings.c:384 msgid "D_uplicate Line or Selection" -msgstr "行/選択範囲を複製(_D)" +msgstr "行/選択範囲を複製(_U)" #: ../data/geany.glade.h:361 ../src/keybindings.c:447 msgid "S_elect Current Line(s)" -msgstr "現在の行を選択(_S)" +msgstr "現在の行を選択(_E)" #: ../data/geany.glade.h:362 ../src/keybindings.c:450 msgid "Se_lect Current Paragraph" -msgstr "現在の段落を選択(_S)" +msgstr "現在の段落を選択(_L)" #: ../data/geany.glade.h:363 msgid "_Move Line(s) Up" @@ -1731,7 +1731,7 @@ msgstr "インデントを減らす(_D)" #: ../data/geany.glade.h:373 ../src/keybindings.c:480 msgid "S_mart Line Indent" -msgstr "スマート行インデント(_S)" +msgstr "スマート行インデント(_M)" #: ../data/geany.glade.h:374 msgid "_Send Selection to" @@ -1771,19 +1771,19 @@ msgstr "置換(_R)..." #: ../data/geany.glade.h:383 msgid "Next Me_ssage" -msgstr "次のメッセージ(_M)" +msgstr "次のメッセージ(_S)" #: ../data/geany.glade.h:384 msgid "Pr_evious Message" msgstr "前のメッセージ(_E)" #: ../data/geany.glade.h:385 ../src/keybindings.c:576 msgid "Go to Ne_xt Marker" -msgstr "次のマーカーへ移動(_G)" +msgstr "次のマーカーへ移動(_X)" #: ../data/geany.glade.h:386 ../src/keybindings.c:579 msgid "Go to Pre_vious Marker" -msgstr "前のマーカーへ移動(_G)" +msgstr "前のマーカーへ移動(_V)" #: ../data/geany.glade.h:387 msgid "_Go to Line..." @@ -1795,7 +1795,7 @@ msgstr "選択文字列を後方検索(_S)" #: ../data/geany.glade.h:389 ../src/keybindings.c:541 msgid "Find Pre_vious Selection" -msgstr "選択文字列を前方に検索(_V)" +msgstr "選択文字列を前方検索(_V)" #: ../data/geany.glade.h:390 ../src/keybindings.c:558 msgid "_Mark All" @@ -1827,23 +1827,23 @@ msgstr "行番号を表示(_L)" #: ../data/geany.glade.h:397 msgid "Show White S_pace" -msgstr "空白を表示(_W)" +msgstr "空白を表示(_P)" #: ../data/geany.glade.h:398 msgid "Show Line _Endings" msgstr "行末を表示(_E)" #: ../data/geany.glade.h:399 msgid "Show Indentation _Guides" -msgstr "インデントを表示(_I)" +msgstr "インデントを表示(_G)" #: ../data/geany.glade.h:400 msgid "Full_screen" msgstr "全画面表示(_S)" #: ../data/geany.glade.h:401 msgid "Toggle All _Additional Widgets" -msgstr "すべての追加ウィジェットを表示/非表示(_G)" +msgstr "すべての追加ウィジェットを表示/非表示(_A)" #: ../data/geany.glade.h:402 msgid "Show Message _Window" @@ -1963,11 +1963,11 @@ msgstr "末尾の空白を除去(_S)" #: ../data/geany.glade.h:431 msgid "Replace Tabs with S_paces" -msgstr "タブを空白で置換(_R)" +msgstr "タブを空白で置換(_P)" #: ../data/geany.glade.h:432 msgid "_Replace Spaces with Tabs..." -msgstr "空白をタブで置換(_Y)..." +msgstr "空白をタブで置換(_R)..." #: ../data/geany.glade.h:433 msgid "_Fold All" @@ -2044,7 +2044,7 @@ msgstr "ヘルプ(_H)" #: ../data/geany.glade.h:451 msgid "Keyboard _Shortcuts" -msgstr "ショートカットキー(_K)" +msgstr "ショートカットキー(_S)" #: ../data/geany.glade.h:452 msgid "Debug _Messages" @@ -2174,7 +2174,7 @@ msgstr "変更済み:" #: ../data/geany.glade.h:481 msgid "Accessed:" -msgstr "アクセス日時:" +msgstr "アクセス済み:" #: ../data/geany.glade.h:482 msgid "(only inside Geany)" @@ -2213,6 +2213,8 @@ msgid "" "Copyright (c) 2005\n" "The Geany contributors" msgstr "" +"Copyright (c) 2005\n" +"Geany 貢献者" #: ../src/about.c:169 msgid "About Geany" @@ -2513,11 +2515,11 @@ msgstr "パス設定を確認してください。" #: ../src/callbacks.c:1495 #, c-format msgid "Cannot execute context action command \"%s\": %s. %s" -msgstr "コンテキストアクションコマンド \"%s\" を実行できません: %s. %s" +msgstr "ユーザ定義コマンド \"%s\" を実行できません: %s. %s" #: ../src/callbacks.c:1504 msgid "No context action set." -msgstr "コンテキストアクションコマンドがありません" +msgstr "ユーザ定義コマンド設定がありません" #: ../src/dialogs.c:160 ../src/document.c:2302 ../src/document.c:2367 #: ../src/document.c:2375 @@ -3507,15 +3509,15 @@ msgstr "対応する括弧に移動" #: ../src/keybindings.c:573 msgid "Toggle marker" -msgstr "マーカーを切り替える" +msgstr "マーカーを切り替え" #: ../src/keybindings.c:582 msgid "Go to Symbol Definition" msgstr "シンボル定義に移動" #: ../src/keybindings.c:585 msgid "Go to Symbol Declaration" -msgstr "タグ宣言に移動" +msgstr "シンボル宣言に移動" #: ../src/keybindings.c:587 msgid "Go to Start of Line" @@ -3543,19 +3545,19 @@ msgstr "次の単語に移動" #: ../src/keybindings.c:602 msgid "Toggle All Additional Widgets" -msgstr "すべての追加ウィジェットを反転" +msgstr "すべての追加ウィジェットを表示/非表示" #: ../src/keybindings.c:605 msgid "Fullscreen" msgstr "全画面表示" #: ../src/keybindings.c:607 msgid "Toggle Messages Window" -msgstr "メッセージウィンドウを表示" +msgstr "メッセージウィンドウを表示/非表示" #: ../src/keybindings.c:610 msgid "Toggle Sidebar" -msgstr "サイドバーを表示" +msgstr "サイドバーを表示/非表示" #: ../src/keybindings.c:612 msgid "Zoom In" @@ -3571,55 +3573,55 @@ msgstr "標準サイズ" #: ../src/keybindings.c:621 msgid "Switch to Editor" -msgstr "エディタに切り替える" +msgstr "エディタに切り替え" #: ../src/keybindings.c:623 msgid "Switch to Search Bar" -msgstr "検索バーに切り替える" +msgstr "検索バーに切り替え" #: ../src/keybindings.c:625 msgid "Switch to Message Window" -msgstr "メッセージウィンドウに切り替える" +msgstr "メッセージウィンドウに切り替え" #: ../src/keybindings.c:627 msgid "Switch to Compiler" -msgstr "サイドバーに切り替える" +msgstr "コンパイラに切り替え" #: ../src/keybindings.c:629 msgid "Switch to Messages" -msgstr "メッセージに切り替える" +msgstr "メッセージに切り替え" #: ../src/keybindings.c:631 msgid "Switch to Scribble" -msgstr "メモに切り替える" +msgstr "メモに切り替え" #: ../src/keybindings.c:633 msgid "Switch to VTE" -msgstr "VTE に切り替える" +msgstr "VTE に切り替え" #: ../src/keybindings.c:635 msgid "Switch to Sidebar" -msgstr "サイドバーに切り替える" +msgstr "サイドバーに切り替え" #: ../src/keybindings.c:637 msgid "Switch to Sidebar Symbol List" -msgstr "シンボルリストサイドバーに切り替える" +msgstr "シンボルリストサイドバーに切り替え" #: ../src/keybindings.c:639 msgid "Switch to Sidebar Document List" -msgstr "文書リストサイドバーに切り替える" +msgstr "文書リストサイドバーに切り替え" #: ../src/keybindings.c:644 msgid "Switch to left document" -msgstr "左の文書に切り替える" +msgstr "左の文書に切り替え" #: ../src/keybindings.c:646 msgid "Switch to right document" -msgstr "右の文書に切り替える" +msgstr "右の文書に切り替え" #: ../src/keybindings.c:648 msgid "Switch to last used document" -msgstr "最後に使用した文書に切り替える" +msgstr "最後に使用した文書に切り替え" #: ../src/keybindings.c:651 msgid "Move document left" @@ -3639,19 +3641,19 @@ msgstr "文書を末尾に移動" #: ../src/keybindings.c:663 msgid "Toggle Line wrapping" -msgstr "行の折り返し" +msgstr "行の折り返しを切り替え" #: ../src/keybindings.c:665 msgid "Toggle Line breaking" -msgstr "自動改行" +msgstr "自動改行を切り替え" #: ../src/keybindings.c:673 msgid "Replace spaces with tabs" -msgstr "タブを空白で置換" +msgstr "タブを空白に置換" #: ../src/keybindings.c:675 msgid "Toggle current fold" -msgstr "行の折りたたみ" +msgstr "行の折りたたみを切り替え" #: ../src/keybindings.c:677 msgid "Fold all" @@ -3715,11 +3717,11 @@ msgstr "色の選択" #: ../src/keybindings.c:997 msgid "Keyboard Shortcuts" -msgstr "ショートカットキー" +msgstr "キーボードショートカット" #: ../src/keybindings.c:1009 msgid "The following keyboard shortcuts are configurable:" -msgstr "以下のショートカットキーが設定できます:" +msgstr "以下のキーボードショートカットが設定できます:" #: ../src/keyfile.c:1034 msgid "Type here what you want, use it as a notice/scratch board" @@ -3739,15 +3741,15 @@ msgstr "" #: ../src/libmain.c:121 msgid "COLUMN" -msgstr "" +msgstr "COLUMN" #: ../src/libmain.c:122 msgid "Use alternate configuration directory DIR" msgstr "代替の設定ディレクトリ DIR を設定" #: ../src/libmain.c:122 msgid "DIR" -msgstr "" +msgstr "DIR" #: ../src/libmain.c:123 msgid "Print internal filetype names" @@ -3775,7 +3777,7 @@ msgstr "" #: ../src/libmain.c:128 ../src/libmain.c:142 msgid "FILE" -msgstr "" +msgstr "FILE" #: ../src/libmain.c:129 msgid "Return a list of open documents in a running Geany instance" @@ -3787,7 +3789,7 @@ msgstr "最初に開かれるファイルの、最初の行番号 LINE を設定 #: ../src/libmain.c:131 msgid "LINE" -msgstr "" +msgstr "LINE" #: ../src/libmain.c:132 msgid "Don't show message window at startup" @@ -3892,12 +3894,11 @@ msgstr "Geany %s を起動しました" #: ../src/libmain.c:1177 #, c-format msgid "Configuration directory could not be created (%s)." -msgstr "設定ディレクトリが作成できませんでした(%s)" +msgstr "設定ディレクトリが作成できません(%s)" #: ../src/libmain.c:1184 -#, fuzzy msgid "IPC socket could not be created, see Help->Debug Messages for details." -msgstr "検索に失敗しました(ヘルプのデバッグメッセージを確認してください)。" +msgstr "IPCソケットが作成できません(ヘルプのデバッグメッセージを確認してください)。" #: ../src/libmain.c:1413 msgid "Do you really want to quit?" @@ -3909,15 +3910,15 @@ msgstr "設定ファイルを再読み込みしました" #: ../src/log.c:185 msgid "Debug Messages" -msgstr "メッセージ" +msgstr "デバッグメッセージ" #: ../src/log.c:187 msgid "Cl_ear" msgstr "クリア(_E)" #: ../src/msgwindow.c:218 msgid "Status messages" -msgstr "ステータスメッセージ" +msgstr "ステータスメッセージ" #: ../src/msgwindow.c:672 msgid "C_opy" @@ -4022,7 +4023,7 @@ msgstr "プラグインを設定" #: ../src/prefs.c:180 msgid "Grab Key" -msgstr "キーの読み取り" +msgstr "キーの組み合わせ" #: ../src/prefs.c:186 #, c-format @@ -4055,7 +4056,7 @@ msgstr "変更(_O)" #: ../src/prefs.c:1487 msgid "Override that keybinding?" -msgstr "ショートカットキーを変更しますか?" +msgstr "キーバインドを変更しますか?" #: ../src/prefs.c:1488 #, c-format @@ -4375,7 +4376,7 @@ msgstr "マーク(_M)" #: ../src/search.c:518 msgid "Mark all matches in the current document" -msgstr "現在の文書で一致するものすべてにマークします" +msgstr "現在の文書で一致するものすべてをマークします" #: ../src/search.c:523 ../src/search.c:698 msgid "In Sessi_on" @@ -4396,7 +4397,7 @@ msgstr "ダイアログを開いたままにするには、このオプション #: ../src/search.c:633 msgid "Replace & Fi_nd" -msgstr "置換して検索(_N)" +msgstr "置換と検索(_N)" #: ../src/search.c:642 msgid "Replace wit_h:" @@ -4695,7 +4696,7 @@ msgstr "モジュール" #: ../src/symbols.c:556 ../src/symbols.c:603 msgid "Traits" -msgstr "Traits" +msgstr "特性" #: ../src/symbols.c:557 msgid "Implementations" @@ -4775,7 +4776,7 @@ msgstr "ID 選択" #: ../src/symbols.c:623 msgid "Type Selectors" -msgstr "Type 選択" +msgstr "タイプ選択" #: ../src/symbols.c:642 msgid "Section Level 1" @@ -4897,7 +4898,7 @@ msgid "" "Usage: %s -g <Tags File> <File list>\n" "\n" msgstr "" -"使用法: %s -g <タグファイル> <ファイルリスト>\n" +"使い方: %s -g <タグファイル> <ファイルリスト>\n" "\n" #: ../src/symbols.c:1680 @@ -5641,7 +5642,7 @@ msgstr "HTML 置換(_H)" #: ../plugins/htmlchars.c:758 msgid "_Auto-replace Special Characters" -msgstr "特殊記号を置換(_A)" +msgstr "特殊記号を自動置換(_A)" #: ../plugins/htmlchars.c:767 msgid "_Replace Characters in Selection" @@ -5657,7 +5658,7 @@ msgstr "特殊記号を置換" #: ../plugins/htmlchars.c:789 msgid "Toggle plugin status" -msgstr "プラグインの状態を反転" +msgstr "プラグインの状態を切り替え" #: ../plugins/export.c:36 msgid "Export" @@ -5898,7 +5899,7 @@ msgstr "新しく作成するファイルのファイルの種類(_F):" #: ../plugins/saveactions.c:719 msgid "Backup Copy" -msgstr "バックアップ" +msgstr "バックアップコピー" #: ../plugins/saveactions.c:729 msgid "_Directory to save backup files in:" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b9c8e7: Update zh_CN.po (#2130)
by 柳东原 LIU Dongyuan 22 Apr '19

22 Apr '19

Branch: refs/heads/master Author: 柳东原 LIU Dongyuan <liu.dongyuan(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 22 Apr 2019 14:56:18 UTC Commit: b9c8e7b0949d799fba906cd156e9e57022fa5067 https://github.com/geany/geany/commit/b9c8e7b0949d799fba906cd156e9e57022fa5… Log Message: ----------- Update zh_CN.po (#2130) * Update zh_CN.po * Update zh_CN.po Modified Paths: -------------- po/zh_CN.po Modified: po/zh_CN.po 44 lines changed, 23 insertions(+), 21 deletions(-) =================================================================== @@ -4,21 +4,21 @@ # This file is distributed under the same license as the geany package. # # Dormouse Young <dormouse.young(a)gmail.com>, 2006-2009. -# Dongyuan Liu <liu.dongyuan(a)gmail.com>, 2009-2018. +# Dongyuan Liu <liu.dongyuan(a)gmail.com>, 2009-2019. # msgid "" msgstr "" -"Project-Id-Version: Geany 1.34\n" +"Project-Id-Version: Geany 1.35\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-15 17:13+0200\n" -"PO-Revision-Date: 2018-12-09 17:43+0800\n" +"POT-Creation-Date: 2019-04-21 02:36+0000\n" +"PO-Revision-Date: 2019-04-22 10:13+0800\n" "Last-Translator: Dongyuan Liu <liu.dongyuan(a)gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh(a)googlegroups.com>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.1.1\n" +"X-Generator: Poedit 2.2.1\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../geany.desktop.in.h:1 ../data/geany.glade.h:343 @@ -2151,68 +2151,70 @@ msgid "" "Copyright (c) 2005\n" "The Geany contributors" msgstr "" +"版权所有 (c) 2005\n" +"Geany 贡献者" -#: ../src/about.c:169 +#: ../src/about.c:170 msgid "About Geany" msgstr "关于 Geany" -#: ../src/about.c:213 +#: ../src/about.c:214 msgid "A fast and lightweight IDE" msgstr "轻快的 IDE" -#: ../src/about.c:235 +#: ../src/about.c:236 #, c-format msgid "(built on or after %s)" msgstr "(%s 或之后生成)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:267 +#: ../src/about.c:268 msgid "Info" msgstr "信息" -#: ../src/about.c:283 +#: ../src/about.c:284 msgid "Developers" msgstr "开发人员" -#: ../src/about.c:290 +#: ../src/about.c:291 msgid "maintainer" msgstr "主管" -#: ../src/about.c:298 ../src/about.c:306 ../src/about.c:314 +#: ../src/about.c:299 ../src/about.c:307 ../src/about.c:315 msgid "developer" msgstr "开发" -#: ../src/about.c:322 +#: ../src/about.c:323 msgid "translation maintainer" msgstr "翻译" -#: ../src/about.c:331 +#: ../src/about.c:332 msgid "Translators" msgstr "翻译者" -#: ../src/about.c:351 +#: ../src/about.c:352 msgid "Previous Translators" msgstr "原翻译者" -#: ../src/about.c:372 +#: ../src/about.c:373 msgid "Contributors" msgstr "贡献者" -#: ../src/about.c:382 +#: ../src/about.c:383 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "一部分贡献者 (详细清单参见文件 %s)" -#: ../src/about.c:408 +#: ../src/about.c:409 msgid "Credits" msgstr "荣誉" -#: ../src/about.c:425 +#: ../src/about.c:426 msgid "License" msgstr "许可条款" -#: ../src/about.c:434 +#: ../src/about.c:435 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -3806,7 +3808,7 @@ msgstr "无法创建配置文件目录 (%s)。" #: ../src/libmain.c:1184 msgid "IPC socket could not be created, see Help->Debug Messages for details." -msgstr "" +msgstr "无法创建 IPC socket，在帮助→调试信息中查看更多信息。" #: ../src/libmain.c:1413 msgid "Do you really want to quit?" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1c5670: Update of the Latvian translation (#2127)
by Ingmārs Dīriņš 21 Apr '19

21 Apr '19

Branch: refs/heads/master Author: Ingmārs Dīriņš <melhiors14(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sat, 20 Apr 2019 18:51:15 UTC Commit: 1c567038fc5f14925690b1ebbafc08289bedc2dc https://github.com/geany/geany/commit/1c567038fc5f14925690b1ebbafc08289bedc… Log Message: ----------- Update of the Latvian translation (#2127) Modified Paths: -------------- po/lv.po Modified: po/lv.po 249 lines changed, 128 insertions(+), 121 deletions(-) =================================================================== @@ -1,14 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) 2006 The Geany contributors. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Ingmārs Dīriņš <melhiors14(a)gmail.com>, 2017. +# Ingmārs Dīriņš <melhiors14(a)gmail.com>, 2017-2019. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-04-15 17:13+0200\n" -"PO-Revision-Date: 2018-01-18 21:49+0200\n" +"POT-Creation-Date: 2019-04-19 02:36+0000\n" +"PO-Revision-Date: 2019-04-19 15:54+0300\n" "Last-Translator: Ingmārs Dīriņš <melhiors14(a)gmail.com>\n" "Language-Team: \n" "Language: lv\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2);\n" -"X-Generator: Poedit 2.0.3\n" +"X-Generator: Poedit 2.2.1\n" #: ../geany.desktop.in.h:1 ../data/geany.glade.h:343 msgid "Geany" @@ -150,11 +150,11 @@ msgstr "Sakrist figūriekavām" #: ../data/geany.glade.h:27 msgid "Left" -msgstr "Kreisā" +msgstr "Pa kreisi" #: ../data/geany.glade.h:28 msgid "Right" -msgstr "Labā" +msgstr "Pa labi" #: ../data/geany.glade.h:29 msgid "Top" @@ -174,7 +174,7 @@ msgstr "Ielādēt datnes no pēdējās sesijas" #: ../data/geany.glade.h:33 msgid "Opens at startup the files from the last session" -msgstr "Pie sāknēšanas atver datnes no pēdējās sesijas" +msgstr "Pēc palaišanas atver datnes no pēdējās sesijas" #: ../data/geany.glade.h:34 msgid "Load virtual terminal support" @@ -185,16 +185,16 @@ msgid "" "Whether the virtual terminal emulation (VTE) should be loaded at startup, " "disable it if you do not need it" msgstr "" -"Vai virtuālā termināļa emulēšanai (VTE) vajadzētu tikt ielādētai pie " -"sāknēšanas, izslēdziet to, ja jums tā nav vajadzīga" +"Vai virtuālā termināļa emulēšanai (VTE) vajadzētu tikt ielādētai palaišanas " +"laikā — izslēdziet, ja jums tā nav vajadzīga" #: ../data/geany.glade.h:36 msgid "Enable plugin support" msgstr "Ieslēgt spraudņu atbalstu" #: ../data/geany.glade.h:37 msgid "Startup" -msgstr "Sāknēšana" +msgstr "Palaišana" #: ../data/geany.glade.h:38 msgid "Save window size" @@ -226,7 +226,7 @@ msgstr "Izslēgšana" #: ../data/geany.glade.h:45 msgid "Startup path:" -msgstr "Sāknēšanas ceļš:" +msgstr "Palaišanas ceļš:" #: ../data/geany.glade.h:46 msgid "" @@ -263,11 +263,11 @@ msgstr "Ceļi" #: ../data/geany.glade.h:52 msgid "Startup" -msgstr "Sāknēšana" +msgstr "Palaišana" #: ../data/geany.glade.h:53 msgid "Beep on errors or when compilation has finished" -msgstr "Pīkstēt pie kļūdām vai kad kompilēšana ir pabeigusies" +msgstr "Pīkstēt pie kļūdām un pie kompilēšanas beigām" #: ../data/geany.glade.h:54 msgid "" @@ -279,7 +279,7 @@ msgstr "" #: ../data/geany.glade.h:55 msgid "Switch to status message list at new message" -msgstr "Pārslēgt uz statusa ziņojuma sarakstu pie jauna ziņojuma" +msgstr "Pārslēgties uz statusa ziņojumu sarakstu pie jauna ziņojuma" #: ../data/geany.glade.h:56 msgid "" @@ -333,7 +333,7 @@ msgstr "Dažādi" #: ../data/geany.glade.h:64 msgid "Always wrap search" -msgstr "Vienmēr aplauzt meklēšanu" +msgstr "Vienmēr veikt meklēšanu visā dokumentā" #: ../data/geany.glade.h:65 msgid "Always wrap search around the document" @@ -350,7 +350,7 @@ msgstr "" #: ../data/geany.glade.h:68 msgid "Use the current word under the cursor for Find dialogs" -msgstr "Lietot pašreizējo vārdu zem kursora priekš dialogiem \"Atrast\"" +msgstr "Lietot pašreizējo vārdu zem kursora dialogā \"Atrast\"" #: ../data/geany.glade.h:69 msgid "" @@ -362,15 +362,15 @@ msgstr "" #: ../data/geany.glade.h:70 msgid "Use the current file's directory for Find in Files" -msgstr "Lietot pašreizējās datnes datņu katalogu priekš \"Atrast datnēs\"" +msgstr "Lietot pašreizējās datnes datņu katalogu dialogā \"Atrast datnēs\"" #: ../data/geany.glade.h:71 msgid "Search" msgstr "Meklēt" #: ../data/geany.glade.h:72 msgid "Use project-based session files" -msgstr "Lietot uz projektiem bāzētas sesiju datnes" +msgstr "Lietot katram projektam savu sesijas datni" #: ../data/geany.glade.h:73 msgid "" @@ -382,7 +382,7 @@ msgstr "" #: ../data/geany.glade.h:74 msgid "Store project file inside the project base directory" -msgstr "Uzglabāt projekta datni iekšpus projekta bāzes datņu kataloga" +msgstr "Uzglabāt projekta datni projekta bāzes datņu katalogā" #: ../data/geany.glade.h:75 msgid "" @@ -391,10 +391,9 @@ msgid "" "directory. You can still change the path of the project file in the New " "Project dialog." msgstr "" -"Kad ieslēgts, projekta datne pēc noklusējuma tiek uzglabāta iekšpus projekta " -"bāzes datņu kataloga, nevis vienu datņu katalogu augstāk, kad izveido jaunus " -"projektus. Jūs joprojām varat izmainīt projekta datnes ceļu dialogā \"Jauns " -"projekts\"." +"Kad ieslēgts, jauna projekta datne pēc noklusējuma tiek uzglabāta projekta " +"bāzes datņu katalogā, nevis vienu datņu katalogu augstāk. Jūs joprojām varat " +"izmainīt projekta datnes ceļu dialogā \"Jauns projekts\"." #: ../data/geany.glade.h:76 msgid "Projects" @@ -538,7 +537,7 @@ msgid "" "of the notebook" msgstr "" "Vai novietot datņu cilnes aiz pašreizējās cilnes, nevis pie piezīmju " -"grāmatas virsotnēm" +"grāmatas malas" #: ../data/geany.glade.h:109 msgid "Double-clicking hides all additional widgets" @@ -578,35 +577,35 @@ msgstr "_Pielikt rīkjoslu pie izvēlnes" #: ../data/geany.glade.h:118 msgid "Pack the toolbar to the main menu to save vertical space" -msgstr "Sapakot rīkjoslu uz galveno izvēlni, lai ietaupītu vertikālo vietu" +msgstr "Ievietot rīkjoslu aiz galvenās izvēlnes, lai ietaupītu vertikālo vietu" #: ../data/geany.glade.h:119 ../src/toolbar.c:943 msgid "Customize Toolbar" msgstr "Pielāgot rīkjoslu" #: ../data/geany.glade.h:120 msgid "System _default" -msgstr "Sistēmas _noklusētais" +msgstr "_Sistēmas" #: ../data/geany.glade.h:121 msgid "Images _and text" msgstr "_Attēli un teksts" #: ../data/geany.glade.h:122 msgid "_Images only" -msgstr "T_ikai attēlus" +msgstr "T_ikai attēli" #: ../data/geany.glade.h:123 msgid "_Text only" -msgstr "_Tikai tekstu" +msgstr "_Tikai teksts" #: ../data/geany.glade.h:124 msgid "Icon style" msgstr "Ikonu stils" #: ../data/geany.glade.h:125 msgid "S_ystem default" -msgstr "S_istēmas noklusētais" +msgstr "S_istēmas" #: ../data/geany.glade.h:126 msgid "_Small icons" @@ -673,8 +672,8 @@ msgid "" "Disable drag and drop completely in the editor window so you can't drag and " "drop any selections within or outside of the editor window" msgstr "" -"Pilnībā izslēgt vilkšanu un nomešanu redaktora logā, tādējādi jūs nevarēsiet " -"vilkt un nomest nevienu atlasi iekšpus vai ārpus redaktora loga" +"Pilnībā izslēgt vilkšanu un nomešanu redaktora logā, lai nevarētu vilkt un " +"nomest nevienu atlasi redaktora logā vai ārpus tā" #: ../data/geany.glade.h:138 msgid "Code folding" @@ -745,18 +744,16 @@ msgstr "" "dokumentiem, lietojiet Projekts->Pielietot noklusējuma atkāpes." #: ../data/geany.glade.h:151 -#, fuzzy msgid "_Width:" -msgstr "Platums:" +msgstr "_Platums:" #: ../data/geany.glade.h:152 msgid "The width in chars of a single indent" msgstr "Vienas atkāpes platums rakstzīmēs" #: ../data/geany.glade.h:153 -#, fuzzy msgid "Auto-indent _mode:" -msgstr "Automātiskās atkāpes režīms:" +msgstr "Automātiskās atkāpes režī_ms:" #: ../data/geany.glade.h:154 msgid "Detect type from file" @@ -810,9 +807,8 @@ msgid "Type:" msgstr "Tips:" #: ../data/geany.glade.h:165 -#, fuzzy msgid "Tab _key indents" -msgstr "Tabulācijas taustiņa atkāpes" +msgstr "Tabulācijas taustiņa at_kāpes" #: ../data/geany.glade.h:166 msgid "" @@ -898,7 +894,7 @@ msgid "" "The amount of characters which are necessary to show the symbol " "autocompletion list" msgstr "" -"Rakstzīmju daudzums, kurš ir vajadzīgs, lai parādītu simbolu automātiskās " +"Rakstzīmju skaits, kurš vajadzīgs, lai parādītu simbolu automātiskās " "pabeigšanas sarakstu" #: ../data/geany.glade.h:183 @@ -1168,36 +1164,36 @@ msgstr "Jaunas datnes" #: ../data/geany.glade.h:240 msgid "Default encoding (new files):" -msgstr "Noklusētais iekodējums (jauno datņu):" +msgstr "Noklusējuma kodējums (jaunajām datnēm):" #: ../data/geany.glade.h:241 msgid "Sets the default encoding for newly created files" -msgstr "Iestata noklusēto iekodējumu jauni izveidotajām datnēm" +msgstr "Iestata noklusējuma kodējumu jaunizveidotajām datnēm" #: ../data/geany.glade.h:242 msgid "Use fixed encoding when opening non-Unicode files" -msgstr "Lietot fiksēto iekodējumu, kad atver ne-Unicode datnes" +msgstr "Lietot fiksēto kodējumu, kad atver ne-Unicode datnes" #: ../data/geany.glade.h:243 msgid "" "This option disables the automatic detection of the file encoding when " "opening non-Unicode files and opens the file with the specified encoding " "(usually not needed)" msgstr "" -"Šī opcija izslēdz automātisko datņu iekodējuma noteikšanu, kad atver ne-" -"Unicode datnes, un atver datni ar norādīto iekodējumu (parasti nav vajadzīgs)" +"Šī opcija izslēdz automātisko datņu kodējuma noteikšanu, kad atver ne-" +"Unicode datnes, un atver datni ar norādīto kodējumu (parasti nav vajadzīgs)" #: ../data/geany.glade.h:244 msgid "Default encoding (existing non-Unicode files):" -msgstr "Noklusējuma iekodējums (pastāvošu ne-Unicode datņu):" +msgstr "Noklusējuma kodējums (esošajām ne-Unicode datnēm):" #: ../data/geany.glade.h:245 msgid "Sets the default encoding for opening existing non-Unicode files" msgstr "Iestata noklusējuma iekodējumu pastāvošu ne-Unicode datņu atvēršanai" #: ../data/geany.glade.h:246 msgid "Encodings" -msgstr "Iekodējumi" +msgstr "Kodējumi" #: ../data/geany.glade.h:247 msgid "Ensure new line at file end" @@ -1540,9 +1536,7 @@ msgstr "" msgid "" "Sets the path to the shell which should be started inside the terminal " "emulation" -msgstr "" -"Iestata ceļu uz čaulu, kurai vajadzētu tikt sāktai iekšpus termināļa " -"emulācijas" +msgstr "Iestata ceļu uz čaulu, kuru palaist termināļa emulācijā" #: ../data/geany.glade.h:322 msgid "Scroll on keystroke" @@ -1588,8 +1582,8 @@ msgid "" "within the VTE." msgstr "" "Šī opcija izslēdz taustiņu sasaisti izvēlnes joslas uznirināšanai " -"(noklusējuma ir F10). Tās izslēgšana var būt lietderīga, ja jūs lietojat, " -"piemēram, \"Midnight Commander\" iekšpus VTE." +"(noklusējuma ir F10). Tās izslēgšana var būt lietderīga, ja lietojat, " +"piemēram, \"Midnight Commander\" virtuālajā terminālī." #: ../data/geany.glade.h:332 msgid "Follow path of the current file" @@ -1968,7 +1962,7 @@ msgstr "Iestatīt datnes _tipu" #: ../data/geany.glade.h:424 msgid "Set _Encoding" -msgstr "Iestatīt i_ekodējumu" +msgstr "I_estatīt kodējumu" #: ../data/geany.glade.h:425 msgid "Set Line E_ndings" @@ -2132,24 +2126,20 @@ msgid "Filename:" msgstr "Datnes nosaukums:" #: ../data/geany.glade.h:465 -#, fuzzy msgid "_Name:" -msgstr "Nosaukums:" +msgstr "_Nosaukums:" #: ../data/geany.glade.h:466 -#, fuzzy msgid "_Description:" -msgstr "Apraksts:" +msgstr "_Apraksts:" #: ../data/geany.glade.h:467 -#, fuzzy msgid "_Base path:" -msgstr "Bāzes ceļš:" +msgstr "_Bāzes ceļš:" #: ../data/geany.glade.h:468 -#, fuzzy msgid "File _patterns:" -msgstr "Datnes struktūras:" +msgstr "_Datņu šabloni:" #: ../data/geany.glade.h:469 msgid "" @@ -2199,7 +2189,7 @@ msgstr "Tikai lasāms:" #: ../data/geany.glade.h:478 msgid "Encoding:" -msgstr "Iekodējums:" +msgstr "Kodējums:" #: ../data/geany.glade.h:479 msgid "Modified:" @@ -2215,7 +2205,7 @@ msgstr "Piekļūts:" #: ../data/geany.glade.h:482 msgid "(only inside Geany)" -msgstr "(tikai iekšpus Geany)" +msgstr "(tikai Geany)" #: ../data/geany.glade.h:483 msgid "Permissions:" @@ -2250,69 +2240,71 @@ msgid "" "Copyright (c) 2005\n" "The Geany contributors" msgstr "" +"Autortiesības (c) 2005\n" +"Geany atbalstītāji" -#: ../src/about.c:169 +#: ../src/about.c:170 msgid "About Geany" msgstr "Par Geany" -#: ../src/about.c:213 +#: ../src/about.c:214 msgid "A fast and lightweight IDE" msgstr "Ātra un viegla IDE" -#: ../src/about.c:235 +#: ../src/about.c:236 #, c-format msgid "(built on or after %s)" msgstr "(būvēts uz vai pēc %s)" #. gtk_container_add(GTK_CONTAINER(info_box), cop_label); -#: ../src/about.c:267 +#: ../src/about.c:268 msgid "Info" msgstr "Informācija" -#: ../src/about.c:283 +#: ../src/about.c:284 msgid "Developers" msgstr "Izstrādātāji" -#: ../src/about.c:290 +#: ../src/about.c:291 msgid "maintainer" msgstr "uzturētājs" -#: ../src/about.c:298 ../src/about.c:306 ../src/about.c:314 +#: ../src/about.c:299 ../src/about.c:307 ../src/about.c:315 msgid "developer" msgstr "izstrādātājs" -#: ../src/about.c:322 +#: ../src/about.c:323 msgid "translation maintainer" msgstr "tulkojuma uzturētājs" -#: ../src/about.c:331 +#: ../src/about.c:332 msgid "Translators" msgstr "Tulkotāji" -#: ../src/about.c:351 +#: ../src/about.c:352 msgid "Previous Translators" msgstr "Iepriekšējie tulkotāji" -#: ../src/about.c:372 +#: ../src/about.c:373 msgid "Contributors" msgstr "Atbalstītāji" -#: ../src/about.c:382 +#: ../src/about.c:383 #, c-format msgid "" "Some of the many contributors (for a more detailed list, see the file %s):" msgstr "" -"Daži no daudziem atbalstītājiem (detalizētākam sarakstam skatīt datni %s):" +"Daži no daudzajiem atbalstītājiem (detalizētākam sarakstam skatīt datni %s):" -#: ../src/about.c:408 +#: ../src/about.c:409 msgid "Credits" msgstr "Ieguldījums" -#: ../src/about.c:425 +#: ../src/about.c:426 msgid "License" msgstr "Licence" -#: ../src/about.c:434 +#: ../src/about.c:435 msgid "" "License text could not be found, please visit http://www.gnu.org/licenses/" "gpl-2.0.txt to view it online." @@ -2382,9 +2374,7 @@ msgstr "Pielāgots teksts" #: ../src/build.c:1219 msgid "Enter custom text here, all entered text is appended to the command." -msgstr "" -"Ievadiet pielāgoto tekstu šeit, viss ievadītais teksts tiek pievienots " -"komandai." +msgstr "Ievadiet pielāgoto tekstu, kuru pievienot būvēšanas komandai." #: ../src/build.c:1298 msgid "_Next Error" @@ -2405,7 +2395,7 @@ msgstr "Būvēt pašreizējo datni" #: ../src/build.c:1596 msgid "Build the current file with Make and the default target" -msgstr "Būvēt pašreizējo datni ar Make un noklusēto mērķi" +msgstr "Būvēt pašreizējo datni ar Make un noklusējuma mērķi" #: ../src/build.c:1598 msgid "Build the current file with Make and the specified target" @@ -2468,7 +2458,7 @@ msgstr "Neatkarīgās komandas" #: ../src/build.c:2000 msgid "Note: Item 2 opens a dialog and appends the response to the command." -msgstr "Piezīme: vienums 2 atver dialogu un pievieno atbildi pie komandas." +msgstr "Piezīme: vienums 2 atver dialogu un pievieno atbildi komandai." #: ../src/build.c:2009 msgid "Execute commands" @@ -2479,8 +2469,8 @@ msgid "" "%d, %e, %f, %p, %l are substituted in command and directory fields, see " "manual for details." msgstr "" -"%d, %e, %f, %p, %l tiek aizstātas komandā un datņu kataloga laukos, skatīt " -"rokasgrāmatu, lai iegūtu sīkāku informāciju." +"%d, %e, %f, %p, %l tiek aizstātas komandas un datņu kataloga laukos, sīkāku " +"informāciju skatiet rokasgrāmatā." #: ../src/build.c:2179 msgid "Set Build Commands" @@ -2527,7 +2517,7 @@ msgstr "Iet uz rindu" #: ../src/callbacks.c:900 msgid "Enter the line you want to go to:" -msgstr "Ievadiet rindu, uz kuru jūs vēlaties doties:" +msgstr "Ievadiet rindu, uz kuru vēlaties doties:" #: ../src/callbacks.c:1001 ../src/callbacks.c:1027 msgid "" @@ -2597,7 +2587,7 @@ msgstr "Rādīt _slēptās datnes" #: ../src/dialogs.c:325 msgid "Set encoding:" -msgstr "Iestatīt iekodējumu:" +msgstr "Iestatīt kodējumu:" #: ../src/dialogs.c:334 msgid "" @@ -2607,11 +2597,10 @@ msgid "" "Note if you choose multiple files, they will all be opened with the chosen " "encoding." msgstr "" -"Atklāti definē iekodējumu priekš datnes, ja tas nevar tikt noteikts. Šis ir " -"lietderīgi, kad jūs zināt, ka Geany datnes iekodējumu nevar noteikt " -"pareizi.\n" -"Ņemiet vērā, ka, ja jūs izvēlēsieties vairākas datnes, tās visas tiks " -"atvērtas ar izvēlēto iekodējumu." +"Atklāti definē kodējumu datnei, ja to nevar noteikt. Šis ir lietderīgi, kad " +"zināt, ka Geany nevar pareizi noteikt datnes kodējumu.\n" +"Ņemiet vērā — ja izvēlēsieties vairākas datnes, tās visas tiks atvērtas ar " +"izvēlēto kodējumu." #. line 2 with filetype combo #: ../src/dialogs.c:341 @@ -2754,7 +2743,8 @@ msgid "" "The file \"%s\" does not look like a text file or the file encoding is not " "supported." msgstr "" -"Datne \"%s\" neizskatās kā teksta datne vai datnes iekodējums nav atbalstīts." +"Datne \"%s\" neizskatās kā teksta datne, vai arī datnes kodējums nav " +"atbalstīts." #: ../src/document.c:1029 #, c-format @@ -2802,9 +2792,9 @@ msgstr "Datne %s pārlādēta." #. * of the newly opened file, %s indicates whether the file is opened read-only #. * (it is replaced with the string ", read-only"). #: ../src/document.c:1495 -#, fuzzy, c-format +#, c-format msgid "File %s opened (%d%s)." -msgstr "Datne %s atvērta(%d%s)." +msgstr "Datne %s atvērta (%d%s)." #: ../src/document.c:1497 msgid ", read-only" @@ -2961,8 +2951,7 @@ msgstr "Ievadiet tabulācijas platumu" #: ../src/editor.c:4462 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" -"Ievadiet atstarpju daudzumu, kuram vajadzētu tikt aizstātam ar tabulācijas " -"rakstzīmi." +"Ievadiet atstarpju skaitu, kuras aizstāt ar vienu tabulācijas rakstzīmi." #: ../src/editor.c:4667 #, c-format @@ -3077,7 +3066,7 @@ msgstr "Korejiešu" #: ../src/encodings.c:142 msgid "Without encoding" -msgstr "Bez iekodējuma" +msgstr "Bez kodējuma" #: ../src/encodings.c:413 msgid "_West European" @@ -3126,7 +3115,7 @@ msgstr "Vidējo Austrumu" #: ../src/filetypes.c:86 #, c-format msgid "%s source file" -msgstr "%s avota datne" +msgstr "%s pirmkoda datne" #: ../src/filetypes.c:87 #, c-format @@ -3153,15 +3142,15 @@ msgstr "Makefile" #: ../src/filetypes.c:159 msgid "Cascading Stylesheet" -msgstr "Stila lapu kaskadēšana" +msgstr "CSS datne" #: ../src/filetypes.c:168 msgid "Config" -msgstr "Konfigurācija" +msgstr "Konfigurācijas" #: ../src/filetypes.c:169 msgid "Gettext translation" -msgstr "Gettext tulkojums" +msgstr "Gettext tulkojuma" #: ../src/filetypes.c:430 msgid "_Programming Languages" @@ -3181,7 +3170,7 @@ msgstr "Dažād_i" #: ../src/filetypes.c:1194 ../src/win32.c:155 msgid "All Source" -msgstr "Visi avoti" +msgstr "Pirmkods" #. create meta file filter "All files" #: ../src/filetypes.c:1219 ../src/project.c:349 ../src/win32.c:145 @@ -3280,7 +3269,7 @@ msgstr "Piezīmju grāmatas cilne" #: ../src/keybindings.c:336 ../src/keybindings.c:368 msgid "New" -msgstr "Jauns" +msgstr "Jauna" #: ../src/keybindings.c:338 ../src/keybindings.c:370 msgid "Open" @@ -3768,7 +3757,7 @@ msgstr "Tastatūras saīsnes" #: ../src/keybindings.c:1009 msgid "The following keyboard shortcuts are configurable:" -msgstr "Sekojošās tastatūras saīsnes ir konfigurējamas:" +msgstr "Šīs tastatūras saīsnes ir konfigurējamas:" #: ../src/keyfile.c:1034 msgid "Type here what you want, use it as a notice/scratch board" @@ -3841,7 +3830,7 @@ msgstr "RINDA" #: ../src/libmain.c:132 msgid "Don't show message window at startup" -msgstr "Nerādīt ziņojumu logu pie sāknēšanas" +msgstr "Nerādīt ziņojumu logu pēc palaišanas" #: ../src/libmain.c:133 msgid "Don't load auto completion data (see documentation)" @@ -3953,6 +3942,8 @@ msgstr "Konfigurācijas datņu katalogs nevarēja tikt izveidots (%s)." #: ../src/libmain.c:1184 msgid "IPC socket could not be created, see Help->Debug Messages for details." msgstr "" +"IPC ligzda nevarēja tikt izveidota, skatīt Palīdzība->Atkļūdošanas ziņojumi, " +"lai iegūtu sīkāku informāciju." #: ../src/libmain.c:1413 msgid "Do you really want to quit?" @@ -4060,8 +4051,7 @@ msgstr "Spraudņi" #: ../src/plugins.c:1976 msgid "Choose which plugins should be loaded at startup:" -msgstr "" -"Izvēlēties, kuriem spraudņiem vajadzētu tikt ielādētiem pie sāknēšanas:" +msgstr "Izvēlieties, kurus spraudņus ielādēt palaišanas laikā:" #: ../src/plugins.c:2069 #, c-format @@ -4204,7 +4194,7 @@ msgid "" "\n" "%s" msgstr "" -"Datne \"%s\" tiks drukāta ar sekojošo komandu:\n" +"Datne \"%s\" tiks drukāta ar šādu komandu:\n" "\n" "%s" @@ -4372,7 +4362,7 @@ msgstr "" #: ../src/search.c:317 msgid "Use _escape sequences" -msgstr "Li_etot atsoļa secības" +msgstr "Li_etot atsoļa virknes" #: ../src/search.c:321 msgid "" @@ -4394,7 +4384,7 @@ msgid "" "the pattern." msgstr "" "Izpildīt regulāro izteiksmju saskaņošanu uzreiz uz visa bufera, nevis rindu " -"pa rindai, atļaujot sakritībām aptvert vairākas rindas. Šajā režīmā jaunas " +"pa rindai, atļaujot sakritībām aptvert vairākas rindas. Šajā režīmā jaunas " "rindas rakstzīmes ir daļa no ievades un var tikt šablona tvertas kā normālas " "rakstzīmes." @@ -4408,11 +4398,11 @@ msgstr "_Reģistrjutīgs" #: ../src/search.c:352 ../src/search.c:975 msgid "Match only a _whole word" -msgstr "_Sakrist tikai ar veselu vārdu" +msgstr "_Tikai veselu vārdu atbilsme" #: ../src/search.c:356 msgid "Match from s_tart of word" -msgstr "Sakris_t no vārda sākuma" +msgstr "A_tbilsme no vārda sākuma" #: ../src/search.c:472 msgid "_Previous" @@ -4626,8 +4616,7 @@ msgstr "Teksts bija tukšs (vai saturēja tikai tukšumzīmes)" #: ../src/spawn.c:153 ../src/spawn.c:167 msgid "A quoted Windows program name must be entirely inside the quotes" msgstr "" -"Pēdiņās esošajam Windows programmas nosaukumam vajag būt pilnībā iekšpus " -"pēdiņām" +"Pēdiņās esošam Windows programmas nosaukumam jābūt pilnībā pēdiņu iekšpusē" #: ../src/spawn.c:260 msgid "Program not found" @@ -5185,8 +5174,8 @@ msgid "" "Select items to be displayed on the toolbar. Items can be reordered by drag " "and drop." msgstr "" -"Atlasiet vienumus, kuri tiks attēloti uz rīkjoslas. Vienumi par tikt " -"pārkārtoti ar vilkšanu un nomešanu." +"Atlasiet vienumus, kurus attēlot rīkjoslā. Vienumus var pārkārtot, tos " +"velkot un nometot." #: ../src/toolbar.c:975 msgid "Available Items" @@ -5306,7 +5295,7 @@ msgid "" "encoding: %e filetype: %f scope: %S" msgstr "" "rinda: %l / %L\t kol.: %c\t atl.: %s\t %w %t %mrežīms: %M " -"iekodējums: %e datnes tips: %f tvērums: %S" +"kodējums: %e datnes tips: %f tvērums: %S" #. L = lines #: ../src/ui_utils.c:238 @@ -5898,7 +5887,7 @@ msgstr "Saglabāt darbības" #: ../plugins/saveactions.c:42 msgid "This plugin provides different actions related to saving of files." -msgstr "Šis spraudnis sniedz dažādas darbības, saistītas ar datņu saglabāšanu." +msgstr "Šis spraudnis piedāvā dažādas ar datņu saglabāšanu saistītas darbības." #: ../plugins/saveactions.c:174 #, c-format @@ -6030,22 +6019,40 @@ msgid "Top and Bottom" msgstr "Augša un apakša" #~ msgid "" -#~ "Copyright (c) 2005-2019\n" +#~ "Copyright (c) 2005-2018\n" #~ "Colomban Wendling\n" #~ "Nick Treleaven\n" #~ "Matthew Brush\n" #~ "Enrico Tröger\n" #~ "Frank Lanitz\n" #~ "All rights reserved." #~ msgstr "" -#~ "Autortiesības (c) 2005-2019\n" +#~ "Autortiesības (c) 2005-2018\n" #~ "Colomban Wendling\n" #~ "Nick Treleaven\n" #~ "Matthew Brush\n" #~ "Enrico Tröger\n" #~ "Frank Lanitz\n" #~ "Visas tiesības paturētas." +#~ msgid "Width:" +#~ msgstr "Platums:" + +#~ msgid "Auto-indent mode:" +#~ msgstr "Automātiskās atkāpes režīms:" + +#~ msgid "Tab key indents" +#~ msgstr "Tabulācijas taustiņa atkāpes" + +#~ msgid "email address of the developer" +#~ msgstr "izstrādātāja e-pasta adrese" + +#~ msgid "Description:" +#~ msgstr "Apraksts:" + +#~ msgid "File patterns:" +#~ msgstr "Datnes struktūras:" + #~ msgid "Filename of libvte.so" #~ msgstr "libvte.so datnes nosaukums" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2ae6cd: Fix incomplete prototype
by Colomban Wendling 20 Apr '19

20 Apr '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 20 Apr 2019 09:50:36 UTC Commit: 2ae6cd9c1a304d4882a47e38253bc8fcb57bec1b https://github.com/geany/geany/commit/2ae6cd9c1a304d4882a47e38253bc8fcb57be… Log Message: ----------- Fix incomplete prototype Use `void` for empty argument lists. Modified Paths: -------------- src/tagmanager/tm_parser.c Modified: src/tagmanager/tm_parser.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -628,7 +628,7 @@ static void add_subparser(TMParserType lang, TMParserType sublang, TMSubparserMa #define SUBPARSER_MAP_ENTRY(lang, sublang, map) add_subparser(TM_PARSER_##lang, TM_PARSER_##sublang, map, G_N_ELEMENTS(map)) -static void init_subparser_map() +static void init_subparser_map(void) { SUBPARSER_MAP_ENTRY(HTML, JAVASCRIPT, subparser_HTML_javascript_map); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2019