Commits January 2014

commits@lists.geany.org

1 participants
57 discussions

[geany/geany] 828df0: Add shebang filetype detection for Rust
by SiegeLord 14 Jan '14

14 Jan '14

Branch: refs/heads/master Author: SiegeLord <slabode(a)aim.com> Committer: SiegeLord <slabode(a)aim.com> Date: Tue, 14 Jan 2014 17:50:38 UTC Commit: 828df0ab5fc6a2a25a3b1a524a34c442dc01921f https://github.com/geany/geany/commit/828df0ab5fc6a2a25a3b1a524a34c442dc019… Log Message: ----------- Add shebang filetype detection for Rust Modified Paths: -------------- src/filetypes.c Modified: src/filetypes.c 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -946,7 +946,8 @@ static GeanyFiletype *find_shebang(const gchar *utf8_filename, const gchar *line { "ash", GEANY_FILETYPES_SH }, { "dmd", GEANY_FILETYPES_D }, { "wish", GEANY_FILETYPES_TCL }, - { "node", GEANY_FILETYPES_JS } + { "node", GEANY_FILETYPES_JS }, + { "rust", GEANY_FILETYPES_RUST } }; gchar *tmp = g_path_get_basename(line + 2); gchar *basename_interpreter = tmp; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 09cb24: Add Rust ctag tests
by dobkeratops 14 Jan '14

14 Jan '14

Branch: refs/heads/master Author: dobkeratops <dobkeratopsgit(a)gmail.com> Committer: SiegeLord <slabode(a)aim.com> Date: Tue, 14 Jan 2014 17:50:38 UTC Commit: 09cb24c7c718fe587d1f3f97feff811c05a8ab72 https://github.com/geany/geany/commit/09cb24c7c718fe587d1f3f97feff811c05a8a… Log Message: ----------- Add Rust ctag tests Modified Paths: -------------- tests/ctags/test_input.rs tests/ctags/test_input.rs.tags tests/ctags/test_input2.rs tests/ctags/test_input2.rs.tags Modified: tests/ctags/test_input.rs 90 files changed, 90 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,90 @@ +#[feature(globs)]; +use std::*; +use test_input2::*; +mod test_input2; + +fn yada(a:int,c:Foo,b:test_input2::fruit::SomeStruct)->~str { a.to_str() } +fn main() { + use test_input2::fruit::*; + io::println(foo_bar_test_func(SomeStruct{red_value:1,green_value:2,blue_value:3},(4,5)).to_str()); + let a=Foo{foo_field_1:2}; + a.my_method(1); + let c=a_cat(3); + let d=Foo{foo_field_1:a.foo_field_1+2}; a.test(); + println(a.foo_field_1.to_str()); +} +struct Bar(int); +struct Baz(int); + +struct Foo{foo_field_1:int} +struct Foo2 { + x:int, + y:int +} + +impl Foo { + fn my_method(&self,_:int){ print("my_method of foo");} +} + +enum Animal { + a_anteater(int), + a_bear(int), + a_cat(int), + a_dog(int), +} + +trait Testable +{ fn test(&self); + fn test1(&self); + fn test2(&self); +} +trait DoZ { + fn do_z(&self); +} + +impl Testable for Foo { + fn test(&self) { + println(self.foo_field_1.to_str()); + } + fn test1(&self) + { + println(self.foo_field_1.to_str()); + } fn test2(&self) + { + println(self.foo_field_1.to_str()); + } + +} +impl DoZ for Foo { + fn do_z(&self) { + println(self.foo_field_1.to_str()); + } +} + +trait SuperTraitTest:Testable+DoZ { +} + +fn gfunc<X:Testable+DoZ>(x:&X) { + let a1=a_anteater(1); + let a2=a_bear(1); + let a3=a_cat(1); + let a4=a_dog(1); + x.test(); + x.do_z(); +} +struct TraitedStructTest<X> { + x:X +} +fn some2(a:Animal) { + match a { + a_cat(x)=> println("cat"), + _ => println("not a cat") + } + +} + + + + + + Modified: tests/ctags/test_input.rs.tags 33 files changed, 33 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,33 @@ +# format=tagmanager +AnimalÌ2Ö0 +BarÌ2048Ö0 +BazÌ2048Ö0 +DoZÌ32Ö0 +FooÌ1Ö0 +FooÌ2048Ö0 +Foo2Ì2048Ö0 +SuperTraitTestÌ32Ö0 +TestableÌ32Ö0 +TraitedStructTestÌ2048Ö0 +a_anteaterÌ4ÎAnimalÖ0 +a_bearÌ4ÎAnimalÖ0 +a_catÌ4ÎAnimalÖ0 +a_dogÌ4ÎAnimalÖ0 +do_zÌ128Í(&self)ÎDoZÖ0 +do_zÌ128Í(&self)ÎFooÖ0 +foo_field_1Ì8ÎFooÖ0 +gfuncÌ16Í<X:Testable+DoZ>(x:&X)Ö0 +mainÌ16Í()Ö0 +my_methodÌ128Í(&self,_:int)ÎFooÖ0 +some2Ì16Í(a:Animal)Ö0 +testÌ128Í(&self)ÎFooÖ0 +testÌ128Í(&self)ÎTestableÖ0 +test1Ì128Í(&self)ÎFooÖ0 +test1Ì128Í(&self)ÎTestableÖ0 +test2Ì128Í(&self)ÎFooÖ0 +test2Ì128Í(&self)ÎTestableÖ0 +test_input2Ì256Ö0 +xÌ8ÎFoo2Ö0 +xÌ8ÎTraitedStructTestÖ0 +yÌ8ÎFoo2Ö0 +yadaÌ16Í(a:int,c:Foo,b:test_input2::fruit::SomeStruct)->~strÖ0 Modified: tests/ctags/test_input2.rs 43 files changed, 43 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,43 @@ +pub fn foo_bar_test_func(apples:fruit::SomeStruct,(oranges,lemon):(int,int))->int{ + let some_var_name=2*oranges; + let a=SomeLongStructName{v:0}; + println("a");println("b"); println("c"); + veg::another_function(apples.red_value,oranges,lemon); + some_var_name-apples.red_value+lemon+a.v +} + + +pub mod fruit { + pub struct SomeStruct{ + red_value:int,green_value:int,blue_value:int + } +} +fn free_func() { +} + +impl SomeLongStructName { + fn fooo() { + } + fn baaz() { + } +} + + +pub struct SomeLongStructName {v:int} + +mod veg{ + pub fn another_function(a:int,b:int,c:int)->int { + a+b+c + } +} + + + +mod mineral { + fn granite() { + } + fn limestone() { + } + fn chalk() { + } +} Modified: tests/ctags/test_input2.rs.tags 19 files changed, 19 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,19 @@ +# format=tagmanager +SomeLongStructNameÌ1Ö0 +SomeLongStructNameÌ2048Ö0 +SomeStructÌ2048ÎfruitÖ0 +another_functionÌ16Í(a:int,b:int,c:int)->intÎvegÖ0 +baazÌ128Í()ÎSomeLongStructNameÖ0 +blue_valueÌ8Îfruit::SomeStructÖ0 +chalkÌ16Í()ÎmineralÖ0 +foo_bar_test_funcÌ16Í(apples:fruit::SomeStruct,(oranges,lemon):(int,int))->intÖ0 +foooÌ128Í()ÎSomeLongStructNameÖ0 +free_funcÌ16Í()Ö0 +fruitÌ256Ö0 +graniteÌ16Í()ÎmineralÖ0 +green_valueÌ8Îfruit::SomeStructÖ0 +limestoneÌ16Í()ÎmineralÖ0 +mineralÌ256Ö0 +red_valueÌ8Îfruit::SomeStructÖ0 +vÌ8ÎSomeLongStructNameÖ0 +vegÌ256Ö0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 370666: Add Rust tests to the makefile
by Colomban Wendling 14 Jan '14

14 Jan '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: SiegeLord <slabode(a)aim.com> Date: Tue, 14 Jan 2014 17:50:38 UTC Commit: 370666865bea7ccb73689990231af87446cfe19a https://github.com/geany/geany/commit/370666865bea7ccb73689990231af87446cfe… Log Message: ----------- Add Rust tests to the makefile Modified Paths: -------------- tests/ctags/Makefile.am Modified: tests/ctags/Makefile.am 2 files changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -229,6 +229,8 @@ test_sources = \ tabindent.py \ test.py \ test.vhd \ + test_input.rs \ + test_input2.rs \ traffic_signal.v \ traits.php \ union.f \ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 416c3d: Clean up Rust ctag tests and make them more comprehensive
by SiegeLord 14 Jan '14

14 Jan '14

Branch: refs/heads/master Author: SiegeLord <slabode(a)aim.com> Committer: SiegeLord <slabode(a)aim.com> Date: Tue, 14 Jan 2014 17:50:38 UTC Commit: 416c3daecc649b63c96503f5c43de37b19220b11 https://github.com/geany/geany/commit/416c3daecc649b63c96503f5c43de37b19220… Log Message: ----------- Clean up Rust ctag tests and make them more comprehensive Modified Paths: -------------- tests/ctags/test_input.rs tests/ctags/test_input.rs.tags tests/ctags/test_input2.rs Modified: tests/ctags/test_input.rs 72 files changed, 60 insertions(+), 12 deletions(-) =================================================================== @@ -1,9 +1,36 @@ +#! fn ignored_in_comment() {} #[feature(globs)]; +#[feature(macro_rules)]; use std::*; use test_input2::*; mod test_input2; -fn yada(a:int,c:Foo,b:test_input2::fruit::SomeStruct)->~str { a.to_str() } +/* + * fn ignored_in_comment() {} + */ + +// fn ignored_in_comment() {} + +/* /* + * */ + fn ignored_in_nested_comment() {} + */ + +static size: uint = 1; + +struct S1 { + only_field: [int, ..size] +} + +macro_rules! test_macro +{ + () => {1} +} + +fn yada(a:int,c:Foo,b:test_input2::fruit::SomeStruct) -> ~str { + a.to_str() +} + fn main() { use test_input2::fruit::*; io::println(foo_bar_test_func(SomeStruct{red_value:1,green_value:2,blue_value:3},(4,5)).to_str()); @@ -12,11 +39,25 @@ fn main() { let c=a_cat(3); let d=Foo{foo_field_1:a.foo_field_1+2}; a.test(); println(a.foo_field_1.to_str()); + ignore! + ( + fn ignored_inside_macro() {} + ) + + let _ = "fn ignored_in_string() {} + "; + + let _ = r##"fn ignored_in_raw_string() {}""##; + + fn nested() {} } + struct Bar(int); + struct Baz(int); struct Foo{foo_field_1:int} + struct Foo2 { x:int, y:int @@ -38,6 +79,7 @@ trait Testable fn test1(&self); fn test2(&self); } + trait DoZ { fn do_z(&self); } @@ -46,15 +88,16 @@ impl Testable for Foo { fn test(&self) { println(self.foo_field_1.to_str()); } - fn test1(&self) - { - println(self.foo_field_1.to_str()); - } fn test2(&self) - { + + fn test1(&self) { println(self.foo_field_1.to_str()); } + fn test2(&self) { + println(self.foo_field_1.to_str()); + } } + impl DoZ for Foo { fn do_z(&self) { println(self.foo_field_1.to_str()); @@ -72,9 +115,20 @@ fn gfunc<X:Testable+DoZ>(x:&X) { x.test(); x.do_z(); } + struct TraitedStructTest<X> { x:X } + +trait ParametrizedTrait<T> { + fn test(&self); +} + +impl<T: Clone> ParametrizedTrait<T> for TraitedStructTest<T> { + fn test(&self) { + } +} + fn some2(a:Animal) { match a { a_cat(x)=> println("cat"), @@ -82,9 +136,3 @@ fn some2(a:Animal) { } } - - - - - - Modified: tests/ctags/test_input.rs.tags 11 files changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -6,8 +6,11 @@ DoZ FooÌ1Ö0 FooÌ2048Ö0 Foo2Ì2048Ö0 +ParametrizedTraitÌ32Ö0 +S1Ì2048Ö0 SuperTraitTestÌ32Ö0 TestableÌ32Ö0 +TraitedStructTestÌ1Ö0 TraitedStructTestÌ2048Ö0 a_anteaterÌ4ÎAnimalÖ0 a_bearÌ4ÎAnimalÖ0 @@ -19,15 +22,21 @@ foo_field_1 gfuncÌ16Í<X:Testable+DoZ>(x:&X)Ö0 mainÌ16Í()Ö0 my_methodÌ128Í(&self,_:int)ÎFooÖ0 +nestedÌ16Í()ÎmainÖ0 +only_fieldÌ8ÎS1Ö0 +sizeÌ16384Ö0 some2Ì16Í(a:Animal)Ö0 testÌ128Í(&self)ÎFooÖ0 +testÌ128Í(&self)ÎParametrizedTraitÖ0 testÌ128Í(&self)ÎTestableÖ0 +testÌ128Í(&self)ÎTraitedStructTestÖ0 test1Ì128Í(&self)ÎFooÖ0 test1Ì128Í(&self)ÎTestableÖ0 test2Ì128Í(&self)ÎFooÖ0 test2Ì128Í(&self)ÎTestableÖ0 test_input2Ì256Ö0 +test_macroÌ65536Ö0 xÌ8ÎFoo2Ö0 xÌ8ÎTraitedStructTestÖ0 yÌ8ÎFoo2Ö0 -yadaÌ16Í(a:int,c:Foo,b:test_input2::fruit::SomeStruct)->~strÖ0 +yadaÌ16Í(a:int,c:Foo,b:test_input2::fruit::SomeStruct) -> ~strÖ0 Modified: tests/ctags/test_input2.rs 5 files changed, 1 insertions(+), 4 deletions(-) =================================================================== @@ -6,12 +6,12 @@ pub fn foo_bar_test_func(apples:fruit::SomeStruct,(oranges,lemon):(int,int))->in some_var_name-apples.red_value+lemon+a.v } - pub mod fruit { pub struct SomeStruct{ red_value:int,green_value:int,blue_value:int } } + fn free_func() { } @@ -22,7 +22,6 @@ impl SomeLongStructName { } } - pub struct SomeLongStructName {v:int} mod veg{ @@ -31,8 +30,6 @@ mod veg{ } } - - mod mineral { fn granite() { } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ad5946: rust: Don't use fileEOF() as it behaves unexpectedly
by Colomban Wendling 14 Jan '14

14 Jan '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: SiegeLord <slabode(a)aim.com> Date: Tue, 14 Jan 2014 17:50:37 UTC Commit: ad59468f3e4efb8e49503a1e5e687196f5013ede https://github.com/geany/geany/commit/ad59468f3e4efb8e49503a1e5e687196f5013… Log Message: ----------- rust: Don't use fileEOF() as it behaves unexpectedly fileEOF() actually returns TRUE anywhere after the last newline when using the file*() API, which includes a last line without newline. This is an implementation detail which makes this function not usable with the rest of the file*() API. fileEOF() should actually probably be called iFileEOF(), but that's outside the scope of this parser. However, even if fileEOF() did work properly with fileGetc(), the very last byte in the input would have been omitted because we actually read ahead by one byte, which means the actual read reaches EOF one byte before our "current byte" does. Checking whether we reached EOF by checking whether our current byte isn't equal to `EOF` fixes it, and isn't worse since it's actually how fileEOF() is implemented anyway. Modified Paths: -------------- tagmanager/ctags/rust.c Modified: tagmanager/ctags/rust.c 20 files changed, 10 insertions(+), 10 deletions(-) =================================================================== @@ -173,7 +173,7 @@ static boolean isIdentifierContinue (int c) static void scanWhitespace (lexerState *lexer) { - while (!fileEOF() && isWhitespace(lexer->cur_c)) + while (isWhitespace(lexer->cur_c)) advanceChar(lexer); } @@ -188,14 +188,14 @@ static void scanComments (lexerState *lexer) if (lexer->next_c == '/' || lexer->next_c == '!') { advanceNChar(lexer, 2); - while (!fileEOF() && lexer->cur_c != '\n') + while (lexer->cur_c != EOF && lexer->cur_c != '\n') advanceChar(lexer); } else if (lexer->next_c == '*') { int level = 1; advanceNChar(lexer, 2); - while (!fileEOF() && level > 0) + while (lexer->cur_c != EOF && level > 0) { if (lexer->cur_c == '*' && lexer->next_c == '/') { @@ -222,7 +222,7 @@ static void scanIdentifier (lexerState *lexer) { vStringPut(lexer->token_str, (char) lexer->cur_c); advanceChar(lexer); - } while(!fileEOF() && isIdentifierContinue(lexer->cur_c)); + } while(lexer->cur_c != EOF && isIdentifierContinue(lexer->cur_c)); } /* Double-quoted strings, we only care about the \" escape. These @@ -234,7 +234,7 @@ static void scanString (lexerState *lexer) { vStringClear(lexer->token_str); advanceChar(lexer); - while (!fileEOF() && lexer->cur_c != '"') + while (lexer->cur_c != EOF && lexer->cur_c != '"') { if (lexer->cur_c == '\\' && lexer->next_c == '"') advanceChar(lexer); @@ -253,7 +253,7 @@ static void scanRawString (lexerState *lexer) vStringClear(lexer->token_str); advanceChar(lexer); /* Count how many leading hashes there are */ - while (!fileEOF() && lexer->cur_c == '#') + while (lexer->cur_c == '#') { num_initial_hashes++; advanceChar(lexer); @@ -261,7 +261,7 @@ static void scanRawString (lexerState *lexer) if (lexer->cur_c != '"') return; advanceChar(lexer); - while (!fileEOF()) + while (lexer->cur_c != EOF) { if (vStringLength(lexer->token_str) < MAX_STRING_LENGTH) vStringPut(lexer->token_str, (char) lexer->cur_c); @@ -271,7 +271,7 @@ static void scanRawString (lexerState *lexer) { size_t num_trailing_hashes = 0; advanceChar(lexer); - while (!fileEOF() && lexer->cur_c == '#' && num_trailing_hashes < num_initial_hashes) + while (lexer->cur_c == '#' && num_trailing_hashes < num_initial_hashes) { num_trailing_hashes++; @@ -306,7 +306,7 @@ static int advanceToken (lexerState *lexer, boolean skip_whitspace) boolean have_whitespace = FALSE; lexer->line = getSourceLineNumber(); lexer->pos = getInputFilePosition(); - while (!fileEOF()) + while (lexer->cur_c != EOF) { if (isWhitespace(lexer->cur_c)) { @@ -327,7 +327,7 @@ static int advanceToken (lexerState *lexer, boolean skip_whitspace) } lexer->line = getSourceLineNumber(); lexer->pos = getInputFilePosition(); - while (!fileEOF()) + while (lexer->cur_c != EOF) { if (lexer->cur_c == '"') { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4d3322: Import the Rust lexer from Scintilla
by SiegeLord 14 Jan '14

14 Jan '14

Branch: refs/heads/master Author: SiegeLord <slabode(a)aim.com> Committer: SiegeLord <slabode(a)aim.com> Date: Tue, 14 Jan 2014 17:50:37 UTC Commit: 4d33223c9877c81bdb5da0bacb31392e843f4d33 https://github.com/geany/geany/commit/4d33223c9877c81bdb5da0bacb31392e843f4… Log Message: ----------- Import the Rust lexer from Scintilla Modified Paths: -------------- scintilla/Makefile.am scintilla/lexers/LexRust.cxx scintilla/makefile.win32 scintilla/src/Catalogue.cxx Modified: scintilla/Makefile.am 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -36,6 +36,7 @@ lexers/LexPython.cxx \ lexers/LexPO.cxx \ lexers/LexR.cxx \ lexers/LexRuby.cxx \ +lexers/LexRust.cxx \ lexers/LexSQL.cxx \ lexers/LexTCL.cxx \ lexers/LexTxt2tags.cxx \ Modified: scintilla/lexers/LexRust.cxx 768 files changed, 768 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,768 @@ +/** @file LexRust.cxx + ** Lexer for Rust. + ** + ** Copyright (c) 2013 by SiegeLord <slabode(a)aim.com> + ** Converted to lexer object and added further folding features/properties by "Udo Lechner" <dlchnr(at)gmx(dot)net> + **/ +// Copyright 1998-2005 by Neil Hodgson <neilh(a)scintilla.org> +// The License.txt file describes the conditions under which this software may be distributed. + +#include <stdlib.h> +#include <string.h> +#include <stdio.h> +#include <stdarg.h> +#include <assert.h> +#include <ctype.h> + +#include <string> +#include <map> + +#include "ILexer.h" +#include "Scintilla.h" +#include "SciLexer.h" + +#include "WordList.h" +#include "LexAccessor.h" +#include "Accessor.h" +#include "StyleContext.h" +#include "CharacterSet.h" +#include "LexerModule.h" +#include "OptionSet.h" +#include "PropSetSimple.h" + +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + +static bool IsStreamCommentStyle(int style) { + return style == SCE_RUST_COMMENTBLOCK || + style == SCE_RUST_COMMENTBLOCKDOC; +} + +// Options used for LexerRust +struct OptionsRust { + bool fold; + bool foldSyntaxBased; + bool foldComment; + bool foldCommentMultiline; + bool foldCommentExplicit; + std::string foldExplicitStart; + std::string foldExplicitEnd; + bool foldExplicitAnywhere; + bool foldCompact; + int foldAtElseInt; + bool foldAtElse; + OptionsRust() { + fold = false; + foldSyntaxBased = true; + foldComment = false; + foldCommentMultiline = true; + foldCommentExplicit = true; + foldExplicitStart = ""; + foldExplicitEnd = ""; + foldExplicitAnywhere = false; + foldCompact = true; + foldAtElseInt = -1; + foldAtElse = false; + } +}; + +static const char * const rustWordLists[] = { + "Primary keywords and identifiers", + "Built in types", + "Other keywords", + "Keywords 4", + "Keywords 5", + "Keywords 6", + "Keywords 7", + 0, + }; + +struct OptionSetRust : public OptionSet<OptionsRust> { + OptionSetRust() { + DefineProperty("fold", &OptionsRust::fold); + + DefineProperty("fold.comment", &OptionsRust::foldComment); + + DefineProperty("fold.compact", &OptionsRust::foldCompact); + + DefineProperty("fold.at.else", &OptionsRust::foldAtElse); + + DefineProperty("fold.rust.syntax.based", &OptionsRust::foldSyntaxBased, + "Set this property to 0 to disable syntax based folding."); + + DefineProperty("fold.rust.comment.multiline", &OptionsRust::foldCommentMultiline, + "Set this property to 0 to disable folding multi-line comments when fold.comment=1."); + + DefineProperty("fold.rust.comment.explicit", &OptionsRust::foldCommentExplicit, + "Set this property to 0 to disable folding explicit fold points when fold.comment=1."); + + DefineProperty("fold.rust.explicit.start", &OptionsRust::foldExplicitStart, + "The string to use for explicit fold start points, replacing the standard //{."); + + DefineProperty("fold.rust.explicit.end", &OptionsRust::foldExplicitEnd, + "The string to use for explicit fold end points, replacing the standard //}."); + + DefineProperty("fold.rust.explicit.anywhere", &OptionsRust::foldExplicitAnywhere, + "Set this property to 1 to enable explicit fold points anywhere, not just in line comments."); + + DefineProperty("lexer.rust.fold.at.else", &OptionsRust::foldAtElseInt, + "This option enables Rust folding on a \"} else {\" line of an if statement."); + + DefineWordListSets(rustWordLists); + } +}; + +class LexerRust : public ILexer { + WordList keywords[7]; + OptionsRust options; + OptionSetRust osRust; +public: + virtual ~LexerRust() { + } + void SCI_METHOD Release() { + delete this; + } + int SCI_METHOD Version() const { + return lvOriginal; + } + const char * SCI_METHOD PropertyNames() { + return osRust.PropertyNames(); + } + int SCI_METHOD PropertyType(const char *name) { + return osRust.PropertyType(name); + } + const char * SCI_METHOD DescribeProperty(const char *name) { + return osRust.DescribeProperty(name); + } + int SCI_METHOD PropertySet(const char *key, const char *val); + const char * SCI_METHOD DescribeWordListSets() { + return osRust.DescribeWordListSets(); + } + int SCI_METHOD WordListSet(int n, const char *wl); + void SCI_METHOD Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + void SCI_METHOD Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess); + void * SCI_METHOD PrivateCall(int, void *) { + return 0; + } + static ILexer *LexerFactoryRust() { + return new LexerRust(); + } +}; + +int SCI_METHOD LexerRust::PropertySet(const char *key, const char *val) { + if (osRust.PropertySet(&options, key, val)) { + return 0; + } + return -1; +} + +int SCI_METHOD LexerRust::WordListSet(int n, const char *wl) { + int firstModification = -1; + if (n < 7) { + WordList *wordListN = &keywords[n]; + WordList wlNew; + wlNew.Set(wl); + if (*wordListN != wlNew) { + wordListN->Set(wl); + firstModification = 0; + } + } + return firstModification; +} + +static bool IsWhitespace(int c) { + return c == ' ' || c == '\t' || c == '\r' || c == '\n'; +} + +/* This isn't quite right for Unicode identifiers */ +static bool IsIdentifierStart(int ch) { + return (IsASCII(ch) && (isalpha(ch) || ch == '_')) || !IsASCII(ch); +} + +/* This isn't quite right for Unicode identifiers */ +static bool IsIdentifierContinue(int ch) { + return (IsASCII(ch) && (isalnum(ch) || ch == '_')) || !IsASCII(ch); +} + +static void ScanWhitespace(Accessor& styler, int& pos, int max) { + while (IsWhitespace(styler.SafeGetCharAt(pos, '\0')) && pos < max) { + if (pos == styler.LineEnd(styler.GetLine(pos))) + styler.SetLineState(styler.GetLine(pos), 0); + pos++; + } + styler.ColourTo(pos-1, SCE_RUST_DEFAULT); +} + +static void GrabString(char* s, Accessor& styler, int start, int len) { + for (int ii = 0; ii < len; ii++) + s[ii] = styler[ii + start]; + s[len] = '\0'; +} + +static void ScanIdentifier(Accessor& styler, int& pos, WordList *keywords) { + int start = pos; + while (IsIdentifierContinue(styler.SafeGetCharAt(pos, '\0'))) + pos++; + + if (styler.SafeGetCharAt(pos, '\0') == '!') { + pos++; + styler.ColourTo(pos - 1, SCE_RUST_MACRO); + } else { + char s[1024]; + int len = pos - start; + len = len > 1024 ? 1024 : len; + GrabString(s, styler, start, len); + bool keyword = false; + for (int ii = 0; ii < 7; ii++) { + if (keywords[ii].InList(s)) { + styler.ColourTo(pos - 1, SCE_RUST_WORD + ii); + keyword = true; + break; + } + } + if (!keyword) { + styler.ColourTo(pos - 1, SCE_RUST_IDENTIFIER); + } + } +} + +static void ScanDigits(Accessor& styler, int& pos, int base) { + for (;;) { + int c = styler.SafeGetCharAt(pos, '\0'); + if (IsADigit(c, base) || c == '_') + pos++; + else + break; + } +} + +static bool ScanExponent(Accessor& styler, int& pos) { + int c = styler.SafeGetCharAt(pos, '\0'); + if (c == 'e' || c == 'E') { + pos++; + c = styler.SafeGetCharAt(pos, '\0'); + if (c == '-' || c == '+') + pos++; + int old_pos = pos; + ScanDigits(styler, pos, 10); + if (old_pos == pos) { + return false; + } + } + return true; +} + +static void ScanNumber(Accessor& styler, int& pos) { + int base = 10; + int c = styler.SafeGetCharAt(pos, '\0'); + int n = styler.SafeGetCharAt(pos + 1, '\0'); + bool error = false; + if (c == '0' && n == 'x') { + pos += 2; + base = 16; + } else if (c == '0' && n == 'b') { + pos += 2; + base = 2; + } + int old_pos = pos; + ScanDigits(styler, pos, base); + c = styler.SafeGetCharAt(pos, '\0'); + if (c == 'u' || c == 'i') { + pos++; + c = styler.SafeGetCharAt(pos, '\0'); + int n = styler.SafeGetCharAt(pos + 1, '\0'); + if (c == '8') { + pos++; + } else if (c == '1' && n == '6') { + pos += 2; + } else if (c == '3' && n == '2') { + pos += 2; + } else if (c == '6' && n == '4') { + pos += 2; + } + } else if (c == '.') { + error = base != 10; + pos++; + ScanDigits(styler, pos, 10); + error |= !ScanExponent(styler, pos); + c = styler.SafeGetCharAt(pos, '\0'); + if (c == 'f') { + pos++; + c = styler.SafeGetCharAt(pos, '\0'); + int n = styler.SafeGetCharAt(pos + 1, '\0'); + if (c == '3' && n == '2') { + pos += 2; + } else if (c == '6' && n == '4') { + pos += 2; + } else { + error = true; + } + } + } + if (old_pos == pos) { + error = true; + } + if (error) + styler.ColourTo(pos - 1, SCE_RUST_LEXERROR); + else + styler.ColourTo(pos - 1, SCE_RUST_NUMBER); +} + +static bool IsOneCharOperator(int c) { + return c == ';' || c == ',' || c == '(' || c == ')' + || c == '{' || c == '}' || c == '[' || c == ']' + || c == '@' || c == '#' || c == '~' || c == '+' + || c == '*' || c == '/' || c == '^' || c == '%' + || c == '.' || c == ':' || c == '!' || c == '<' + || c == '>' || c == '=' || c == '-' || c == '&' + || c == '|' || c == '$'; +} + +static bool IsTwoCharOperator(int c, int n) { + return (c == '.' && n == '.') || (c == ':' && n == ':') + || (c == '!' && n == '=') || (c == '<' && n == '<') + || (c == '<' && n == '=') || (c == '>' && n == '>') + || (c == '>' && n == '=') || (c == '=' && n == '=') + || (c == '=' && n == '>') || (c == '-' && n == '>') + || (c == '&' && n == '&') || (c == '|' && n == '|') + || (c == '-' && n == '=') || (c == '&' && n == '=') + || (c == '|' && n == '=') || (c == '+' && n == '=') + || (c == '*' && n == '=') || (c == '/' && n == '=') + || (c == '^' && n == '=') || (c == '%' && n == '='); +} + +static bool IsThreeCharOperator(int c, int n, int n2) { + return (c == '<' && n == '<' && n2 == '=') + || (c == '>' && n == '>' && n2 == '='); +} + +static bool IsValidCharacterEscape(int c) { + return c == 'n' || c == 'r' || c == 't' || c == '\\' + || c == '\'' || c == '"' || c == '0'; +} + +static bool IsValidStringEscape(int c) { + return IsValidCharacterEscape(c) || c == '\n'; +} + +static bool ScanNumericEscape(Accessor &styler, int& pos, int num_digits, bool stop_asap) { + for (;;) { + int c = styler.SafeGetCharAt(pos, '\0'); + if (!IsADigit(c, 16)) + break; + num_digits--; + pos++; + if (num_digits == 0 && stop_asap) + return true; + } + if (num_digits == 0) { + return true; + } else { + return false; + } +} + +/* This is overly permissive for character literals in order to accept UTF-8 encoded + * character literals. */ +static void ScanCharacterLiteralOrLifetime(Accessor &styler, int& pos) { + pos++; + int c = styler.SafeGetCharAt(pos, '\0'); + int n = styler.SafeGetCharAt(pos + 1, '\0'); + bool done = false; + bool valid_lifetime = IsIdentifierStart(c); + bool valid_char = true; + bool first = true; + while (!done) { + switch (c) { + case '\\': + done = true; + if (IsValidCharacterEscape(n)) { + pos += 2; + } else if (n == 'x') { + pos += 2; + valid_char = ScanNumericEscape(styler, pos, 2, false); + } else if (n == 'u') { + pos += 2; + valid_char = ScanNumericEscape(styler, pos, 4, false); + } else if (n == 'U') { + pos += 2; + valid_char = ScanNumericEscape(styler, pos, 8, false); + } else { + valid_char = false; + } + break; + case '\'': + valid_char = !first; + done = true; + break; + case '\t': + case '\n': + case '\r': + case '\0': + valid_char = false; + done = true; + break; + default: + if (!IsIdentifierContinue(c) && !first) { + done = true; + } else { + pos++; + } + break; + } + c = styler.SafeGetCharAt(pos, '\0'); + n = styler.SafeGetCharAt(pos + 1, '\0'); + + first = false; + } + if (styler.SafeGetCharAt(pos, '\0') == '\'') { + valid_lifetime = false; + } else { + valid_char = false; + } + if (valid_lifetime) { + styler.ColourTo(pos - 1, SCE_RUST_LIFETIME); + } else if (valid_char) { + pos++; + styler.ColourTo(pos - 1, SCE_RUST_CHARACTER); + } else { + styler.ColourTo(pos - 1, SCE_RUST_LEXERROR); + } +} + +enum CommentState { + UnknownComment, + DocComment, + NotDocComment +}; + +/* + * The rule for block-doc comments is as follows (use x for asterisk)... /xx and /x! start doc comments + * unless the entire comment is x's. + */ +static void ResumeBlockComment(Accessor &styler, int& pos, int max, CommentState state) { + int c = styler.SafeGetCharAt(pos, '\0'); + bool maybe_doc_comment = false; + bool any_non_asterisk = false; + if (c == '*' || c == '!') { + maybe_doc_comment = true; + } + for (;;) { + if (pos == styler.LineEnd(styler.GetLine(pos))) + styler.SetLineState(styler.GetLine(pos), 0); + if (c == '*') { + int n = styler.SafeGetCharAt(pos + 1, '\0'); + if (n == '/') { + pos += 2; + if (state == DocComment || (state == UnknownComment && maybe_doc_comment && any_non_asterisk)) + styler.ColourTo(pos - 1, SCE_RUST_COMMENTBLOCKDOC); + else + styler.ColourTo(pos - 1, SCE_RUST_COMMENTBLOCK); + break; + } + } else { + any_non_asterisk = true; + } + if (c == '\0' || pos >= max) { + if (state == DocComment || (state == UnknownComment && maybe_doc_comment)) + styler.ColourTo(pos - 1, SCE_RUST_COMMENTBLOCKDOC); + else + styler.ColourTo(pos - 1, SCE_RUST_COMMENTBLOCK); + break; + } + pos++; + c = styler.SafeGetCharAt(pos, '\0'); + } +} + +/* + * The rule for line-doc comments is as follows... /// and //! start doc comments + * unless the comment is composed entirely of /'s followed by whitespace. That is: + * // - comment + * /// - doc-comment + * //// - comment + * ////a - doc-comment + */ +static void ResumeLineComment(Accessor &styler, int& pos, int max, CommentState state) { + bool maybe_doc_comment = false; + int num_leading_slashes = 0; + int c = styler.SafeGetCharAt(pos, '\0'); + if (c == '/') { + num_leading_slashes = 1; + while (pos < max) { + pos++; + c = styler.SafeGetCharAt(pos, '\0'); + if (c == '/') { + num_leading_slashes++; + } else { + break; + } + } + } else if (c == '!') { + maybe_doc_comment = true; + } + + bool non_white_space = false; + while (pos < max && c != '\n' && c != '\0') { + if (!IsWhitespace(c)) + non_white_space = true; + if (pos == styler.LineEnd(styler.GetLine(pos))) + styler.SetLineState(styler.GetLine(pos), 0); + pos++; + c = styler.SafeGetCharAt(pos, '\0'); + } + + maybe_doc_comment |= num_leading_slashes == 1 || (num_leading_slashes > 1 && non_white_space); + + if (state == DocComment || (state == UnknownComment && maybe_doc_comment)) + styler.ColourTo(pos - 1, SCE_RUST_COMMENTLINEDOC); + else + styler.ColourTo(pos - 1, SCE_RUST_COMMENTLINE); +} + +static void ScanComments(Accessor &styler, int& pos, int max) { + pos++; + int c = styler.SafeGetCharAt(pos, '\0'); + pos++; + if (c == '/') + ResumeLineComment(styler, pos, max, UnknownComment); + else if (c == '*') + ResumeBlockComment(styler, pos, max, UnknownComment); +} + +static void ResumeString(Accessor &styler, int& pos, int max) { + int c = styler.SafeGetCharAt(pos, '\0'); + bool error = false; + while (c != '"' && !error) { + if (c == '\0' || pos >= max) { + error = true; + break; + } + if (pos == styler.LineEnd(styler.GetLine(pos))) + styler.SetLineState(styler.GetLine(pos), 0); + if (c == '\\') { + int n = styler.SafeGetCharAt(pos + 1, '\0'); + if (IsValidStringEscape(n)) { + pos += 2; + } else if (n == 'x') { + pos += 2; + error = !ScanNumericEscape(styler, pos, 2, true); + } else if (n == 'u') { + pos += 2; + error = !ScanNumericEscape(styler, pos, 4, true); + } else if (n == 'U') { + pos += 2; + error = !ScanNumericEscape(styler, pos, 8, true); + } else { + pos += 1; + error = true; + } + } else { + pos++; + } + c = styler.SafeGetCharAt(pos, '\0'); + } + if (!error) + pos++; + styler.ColourTo(pos - 1, SCE_RUST_STRING); +} + +static void ResumeRawString(Accessor &styler, int& pos, int max, int num_hashes) { + for (;;) { + int c = styler.SafeGetCharAt(pos, '\0'); + if (c == '"') { + pos++; + int trailing_num_hashes = 0; + while (styler.SafeGetCharAt(pos, '\0') == '#' && trailing_num_hashes < num_hashes) { + trailing_num_hashes++; + pos++; + } + if (trailing_num_hashes == num_hashes) { + styler.SetLineState(styler.GetLine(pos), 0); + styler.ColourTo(pos - 1, SCE_RUST_STRINGR); + break; + } + } else if (c == '\0' || pos >= max) { + styler.ColourTo(pos - 1, SCE_RUST_STRINGR); + break; + } + if (pos == styler.LineEnd(styler.GetLine(pos))) + styler.SetLineState(styler.GetLine(pos), num_hashes); + pos++; + } +} + +static void ScanRawString(Accessor &styler, int& pos, int max) { + pos++; + int num_hashes = 0; + while (styler.SafeGetCharAt(pos, '\0') == '#') { + num_hashes++; + pos++; + } + if (styler.SafeGetCharAt(pos, '\0') != '"') { + styler.ColourTo(pos - 1, SCE_RUST_LEXERROR); + } else { + pos++; + ResumeRawString(styler, pos, max, num_hashes); + } +} + +void SCI_METHOD LexerRust::Lex(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { + PropSetSimple props; + Accessor styler(pAccess, &props); + int pos = startPos; + int max = pos + length; + + styler.StartAt(pos); + styler.StartSegment(pos); + + if (initStyle == SCE_RUST_COMMENTBLOCK || initStyle == SCE_RUST_COMMENTBLOCKDOC) { + ResumeBlockComment(styler, pos, max, initStyle == SCE_RUST_COMMENTBLOCKDOC ? DocComment : NotDocComment); + } else if (initStyle == SCE_RUST_COMMENTLINE || initStyle == SCE_RUST_COMMENTLINEDOC) { + ResumeLineComment(styler, pos, max, initStyle == SCE_RUST_COMMENTLINEDOC ? DocComment : NotDocComment); + } else if (initStyle == SCE_RUST_STRING) { + ResumeString(styler, pos, max); + } else if (initStyle == SCE_RUST_STRINGR) { + ResumeRawString(styler, pos, max, styler.GetLineState(styler.GetLine(pos) - 1)); + } + + while (pos < max) { + int c = styler.SafeGetCharAt(pos, '\0'); + int n = styler.SafeGetCharAt(pos + 1, '\0'); + int n2 = styler.SafeGetCharAt(pos + 2, '\0'); + + if (pos == 0 && c == '#' && n == '!') { + pos += 2; + ResumeLineComment(styler, pos, max, NotDocComment); + } else if (IsWhitespace(c)) { + ScanWhitespace(styler, pos, max); + } else if (c == '/' && (n == '/' || n == '*')) { + ScanComments(styler, pos, max); + } else if (c == 'r' && (n == '#' || n == '"')) { + ScanRawString(styler, pos, max); + } else if (IsIdentifierStart(c)) { + ScanIdentifier(styler, pos, keywords); + } else if (IsADigit(c)) { + ScanNumber(styler, pos); + } else if (IsThreeCharOperator(c, n, n2)) { + pos += 3; + styler.ColourTo(pos - 1, SCE_RUST_OPERATOR); + } else if (IsTwoCharOperator(c, n)) { + pos += 2; + styler.ColourTo(pos - 1, SCE_RUST_OPERATOR); + } else if (IsOneCharOperator(c)) { + pos++; + styler.ColourTo(pos - 1, SCE_RUST_OPERATOR); + } else if (c == '\'') { + ScanCharacterLiteralOrLifetime(styler, pos); + } else if (c == '"') { + pos++; + ResumeString(styler, pos, max); + } else { + pos++; + styler.ColourTo(pos - 1, SCE_RUST_LEXERROR); + } + } + styler.ColourTo(pos - 1, SCE_RUST_DEFAULT); + styler.Flush(); +} + +void SCI_METHOD LexerRust::Fold(unsigned int startPos, int length, int initStyle, IDocument *pAccess) { + + if (!options.fold) + return; + + LexAccessor styler(pAccess); + + unsigned int endPos = startPos + length; + int visibleChars = 0; + bool inLineComment = false; + int lineCurrent = styler.GetLine(startPos); + int levelCurrent = SC_FOLDLEVELBASE; + if (lineCurrent > 0) + levelCurrent = styler.LevelAt(lineCurrent-1) >> 16; + unsigned int lineStartNext = styler.LineStart(lineCurrent+1); + int levelMinCurrent = levelCurrent; + int levelNext = levelCurrent; + char chNext = styler[startPos]; + int styleNext = styler.StyleAt(startPos); + int style = initStyle; + const bool userDefinedFoldMarkers = !options.foldExplicitStart.empty() && !options.foldExplicitEnd.empty(); + for (unsigned int i = startPos; i < endPos; i++) { + char ch = chNext; + chNext = styler.SafeGetCharAt(i + 1); + int stylePrev = style; + style = styleNext; + styleNext = styler.StyleAt(i + 1); + bool atEOL = i == (lineStartNext-1); + if ((style == SCE_RUST_COMMENTLINE) || (style == SCE_RUST_COMMENTLINEDOC)) + inLineComment = true; + if (options.foldComment && options.foldCommentMultiline && IsStreamCommentStyle(style) && !inLineComment) { + if (!IsStreamCommentStyle(stylePrev)) { + levelNext++; + } else if (!IsStreamCommentStyle(styleNext) && !atEOL) { + // Comments don't end at end of line and the next character may be unstyled. + levelNext--; + } + } + if (options.foldComment && options.foldCommentExplicit && ((style == SCE_RUST_COMMENTLINE) || options.foldExplicitAnywhere)) { + if (userDefinedFoldMarkers) { + if (styler.Match(i, options.foldExplicitStart.c_str())) { + levelNext++; + } else if (styler.Match(i, options.foldExplicitEnd.c_str())) { + levelNext--; + } + } else { + if ((ch == '/') && (chNext == '/')) { + char chNext2 = styler.SafeGetCharAt(i + 2); + if (chNext2 == '{') { + levelNext++; + } else if (chNext2 == '}') { + levelNext--; + } + } + } + } + if (options.foldSyntaxBased && (style == SCE_RUST_OPERATOR)) { + if (ch == '{') { + // Measure the minimum before a '{' to allow + // folding on "} else {" + if (levelMinCurrent > levelNext) { + levelMinCurrent = levelNext; + } + levelNext++; + } else if (ch == '}') { + levelNext--; + } + } + if (!IsASpace(ch)) + visibleChars++; + if (atEOL || (i == endPos-1)) { + int levelUse = levelCurrent; + if (options.foldSyntaxBased && options.foldAtElse) { + levelUse = levelMinCurrent; + } + int lev = levelUse | levelNext << 16; + if (visibleChars == 0 && options.foldCompact) + lev |= SC_FOLDLEVELWHITEFLAG; + if (levelUse < levelNext) + lev |= SC_FOLDLEVELHEADERFLAG; + if (lev != styler.LevelAt(lineCurrent)) { + styler.SetLevel(lineCurrent, lev); + } + lineCurrent++; + lineStartNext = styler.LineStart(lineCurrent+1); + levelCurrent = levelNext; + levelMinCurrent = levelCurrent; + if (atEOL && (i == static_cast<unsigned int>(styler.Length()-1))) { + // There is an empty line at end of file so give it same level and empty + styler.SetLevel(lineCurrent, (levelCurrent | levelCurrent << 16) | SC_FOLDLEVELWHITEFLAG); + } + visibleChars = 0; + inLineComment = false; + } + } +} + +LexerModule lmRust(SCLEX_RUST, LexerRust::LexerFactoryRust, "rust", rustWordLists); Modified: scintilla/makefile.win32 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -96,6 +96,7 @@ LexLua.o \ LexHaskell.o \ LexBasic.o \ LexR.o \ +LexRust.o \ LexYAML.o \ LexCmake.o \ LexNsis.o Modified: scintilla/src/Catalogue.cxx 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -112,6 +112,7 @@ int Scintilla_LinkLexers() { LINK_LEXER(lmPython); LINK_LEXER(lmR); LINK_LEXER(lmRuby); + LINK_LEXER(lmRust); LINK_LEXER(lmSQL); LINK_LEXER(lmTCL); LINK_LEXER(lmTxt2tags); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] aa7e93: Update our Scintilla patch for the addition of Rust lexer
by Colomban Wendling 14 Jan '14

14 Jan '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: SiegeLord <slabode(a)aim.com> Date: Tue, 14 Jan 2014 17:50:37 UTC Commit: aa7e938164dc14cb1d866effb0c11b42ec11ff6e https://github.com/geany/geany/commit/aa7e938164dc14cb1d866effb0c11b42ec11f… Log Message: ----------- Update our Scintilla patch for the addition of Rust lexer Modified Paths: -------------- scintilla/scintilla_changes.patch Modified: scintilla/scintilla_changes.patch 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -31,7 +31,7 @@ diff --git b/scintilla/src/Catalogue.cxx a/scintilla/src/Catalogue.cxx index e728f34..85116a5 100644 +++ scintilla/src/Catalogue.cxx --- scintilla/src/Catalogue.cxx -@@ -76,112 +76,47 @@ int Scintilla_LinkLexers() { +@@ -76,112 +76,48 @@ int Scintilla_LinkLexers() { //++Autogenerated -- run scripts/LexGen.py to regenerate //**$\tLINK_LEXER(\*);\n$ @@ -121,7 +121,7 @@ index e728f34..85116a5 100644 LINK_LEXER(lmR); - LINK_LEXER(lmREBOL); LINK_LEXER(lmRuby); -- LINK_LEXER(lmRust); + LINK_LEXER(lmRust); - LINK_LEXER(lmScriptol); - LINK_LEXER(lmSmalltalk); - LINK_LEXER(lmSML); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] a08557: Use :: as the context separator for Rust
by SiegeLord 14 Jan '14

14 Jan '14

Branch: refs/heads/master Author: SiegeLord <slabode(a)aim.com> Committer: SiegeLord <slabode(a)aim.com> Date: Tue, 14 Jan 2014 17:50:37 UTC Commit: a08557321296e9fa63dae7b25a2bf71a31a92b39 https://github.com/geany/geany/commit/a08557321296e9fa63dae7b25a2bf71a31a92… Log Message: ----------- Use :: as the context separator for Rust Modified Paths: -------------- src/symbols.c Modified: src/symbols.c 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -300,6 +300,7 @@ const gchar *symbols_get_context_separator(gint ft_id) case GEANY_FILETYPES_GLSL: /* for structs */ /*case GEANY_FILETYPES_RUBY:*/ /* not sure what to use atm*/ case GEANY_FILETYPES_PHP: + case GEANY_FILETYPES_RUST: return "::"; /* avoid confusion with other possible separators in group/section name */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 36537c: Update Rust Scintilla lexer to Scintilla revision 4946:4d9978010c3a
by SiegeLord 14 Jan '14

14 Jan '14

Branch: refs/heads/master Author: SiegeLord <slabode(a)aim.com> Committer: SiegeLord <slabode(a)aim.com> Date: Tue, 14 Jan 2014 17:50:37 UTC Commit: 36537c4dcd7d3f78075289128c0e0a4a13544880 https://github.com/geany/geany/commit/36537c4dcd7d3f78075289128c0e0a4a13544… Log Message: ----------- Update Rust Scintilla lexer to Scintilla revision 4946:4d9978010c3a Modified Paths: -------------- scintilla/lexers/LexRust.cxx Modified: scintilla/lexers/LexRust.cxx 177 files changed, 95 insertions(+), 82 deletions(-) =================================================================== @@ -34,6 +34,9 @@ using namespace Scintilla; #endif +static const int NUM_RUST_KEYWORD_LISTS = 7; +static const int MAX_RUST_IDENT_CHARS = 1023; + static bool IsStreamCommentStyle(int style) { return style == SCE_RUST_COMMENTBLOCK || style == SCE_RUST_COMMENTBLOCKDOC; @@ -67,7 +70,7 @@ struct OptionsRust { } }; -static const char * const rustWordLists[] = { +static const char * const rustWordLists[NUM_RUST_KEYWORD_LISTS + 1] = { "Primary keywords and identifiers", "Built in types", "Other keywords", @@ -114,7 +117,7 @@ struct OptionSetRust : public OptionSet<OptionsRust> { }; class LexerRust : public ILexer { - WordList keywords[7]; + WordList keywords[NUM_RUST_KEYWORD_LISTS]; OptionsRust options; OptionSetRust osRust; public: @@ -159,7 +162,7 @@ int SCI_METHOD LexerRust::PropertySet(const char *key, const char *val) { int SCI_METHOD LexerRust::WordListSet(int n, const char *wl) { int firstModification = -1; - if (n < 7) { + if (n < NUM_RUST_KEYWORD_LISTS) { WordList *wordListN = &keywords[n]; WordList wlNew; wlNew.Set(wl); @@ -209,12 +212,12 @@ static void ScanIdentifier(Accessor& styler, int& pos, WordList *keywords) { pos++; styler.ColourTo(pos - 1, SCE_RUST_MACRO); } else { - char s[1024]; + char s[MAX_RUST_IDENT_CHARS + 1]; int len = pos - start; - len = len > 1024 ? 1024 : len; + len = len > MAX_RUST_IDENT_CHARS ? MAX_RUST_IDENT_CHARS : len; GrabString(s, styler, start, len); bool keyword = false; - for (int ii = 0; ii < 7; ii++) { + for (int ii = 0; ii < NUM_RUST_KEYWORD_LISTS; ii++) { if (keywords[ii].InList(s)) { styler.ColourTo(pos - 1, SCE_RUST_WORD + ii); keyword = true; @@ -237,41 +240,28 @@ static void ScanDigits(Accessor& styler, int& pos, int base) { } } -static bool ScanExponent(Accessor& styler, int& pos) { - int c = styler.SafeGetCharAt(pos, '\0'); - if (c == 'e' || c == 'E') { - pos++; - c = styler.SafeGetCharAt(pos, '\0'); - if (c == '-' || c == '+') - pos++; - int old_pos = pos; - ScanDigits(styler, pos, 10); - if (old_pos == pos) { - return false; - } - } - return true; -} - static void ScanNumber(Accessor& styler, int& pos) { int base = 10; int c = styler.SafeGetCharAt(pos, '\0'); int n = styler.SafeGetCharAt(pos + 1, '\0'); bool error = false; if (c == '0' && n == 'x') { - pos += 2; - base = 16; - } else if (c == '0' && n == 'b') { - pos += 2; - base = 2; - } - int old_pos = pos; - ScanDigits(styler, pos, base); - c = styler.SafeGetCharAt(pos, '\0'); - if (c == 'u' || c == 'i') { + pos += 2; + base = 16; + } else if (c == '0' && n == 'b') { + pos += 2; + base = 2; + } else if (c == '0' && n == 'o') { + pos += 2; + base = 8; + } + int old_pos = pos; + ScanDigits(styler, pos, base); + c = styler.SafeGetCharAt(pos, '\0'); + if (c == 'u' || c == 'i') { pos++; c = styler.SafeGetCharAt(pos, '\0'); - int n = styler.SafeGetCharAt(pos + 1, '\0'); + n = styler.SafeGetCharAt(pos + 1, '\0'); if (c == '8') { pos++; } else if (c == '1' && n == '6') { @@ -281,16 +271,34 @@ static void ScanNumber(Accessor& styler, int& pos) { } else if (c == '6' && n == '4') { pos += 2; } - } else if (c == '.') { - error = base != 10; - pos++; - ScanDigits(styler, pos, 10); - error |= !ScanExponent(styler, pos); + } else { + n = styler.SafeGetCharAt(pos + 1, '\0'); + if (c == '.' && !(IsIdentifierStart(n) || n == '.')) { + error |= base != 10; + pos++; + ScanDigits(styler, pos, 10); + } + + c = styler.SafeGetCharAt(pos, '\0'); + if (c == 'e' || c == 'E') { + error |= base != 10; + pos++; + c = styler.SafeGetCharAt(pos, '\0'); + if (c == '-' || c == '+') + pos++; + int old_pos = pos; + ScanDigits(styler, pos, 10); + if (old_pos == pos) { + error = true; + } + } + c = styler.SafeGetCharAt(pos, '\0'); if (c == 'f') { + error |= base != 10; pos++; c = styler.SafeGetCharAt(pos, '\0'); - int n = styler.SafeGetCharAt(pos + 1, '\0'); + n = styler.SafeGetCharAt(pos + 1, '\0'); if (c == '3' && n == '2') { pos += 2; } else if (c == '6' && n == '4') { @@ -438,83 +446,86 @@ enum CommentState { }; /* - * The rule for block-doc comments is as follows (use x for asterisk)... /xx and /x! start doc comments - * unless the entire comment is x's. + * The rule for block-doc comments is as follows: /xxN and /x! (where x is an asterisk, N is a non-asterisk) start doc comments. + * Otherwise it's a regular comment. */ -static void ResumeBlockComment(Accessor &styler, int& pos, int max, CommentState state) { +static void ResumeBlockComment(Accessor &styler, int& pos, int max, CommentState state, int level) { int c = styler.SafeGetCharAt(pos, '\0'); bool maybe_doc_comment = false; - bool any_non_asterisk = false; - if (c == '*' || c == '!') { + if (c == '*') { + int n = styler.SafeGetCharAt(pos + 1, '\0'); + if (n != '*' && n != '/') { + maybe_doc_comment = true; + } + } else if (c == '!') { maybe_doc_comment = true; } + for (;;) { + int n = styler.SafeGetCharAt(pos + 1, '\0'); if (pos == styler.LineEnd(styler.GetLine(pos))) - styler.SetLineState(styler.GetLine(pos), 0); + styler.SetLineState(styler.GetLine(pos), level); if (c == '*') { - int n = styler.SafeGetCharAt(pos + 1, '\0'); + pos++; if (n == '/') { - pos += 2; - if (state == DocComment || (state == UnknownComment && maybe_doc_comment && any_non_asterisk)) - styler.ColourTo(pos - 1, SCE_RUST_COMMENTBLOCKDOC); - else - styler.ColourTo(pos - 1, SCE_RUST_COMMENTBLOCK); - break; + pos++; + level--; + if (level == 0) { + styler.SetLineState(styler.GetLine(pos), 0); + if (state == DocComment || (state == UnknownComment && maybe_doc_comment)) + styler.ColourTo(pos - 1, SCE_RUST_COMMENTBLOCKDOC); + else + styler.ColourTo(pos - 1, SCE_RUST_COMMENTBLOCK); + break; + } + } + } else if (c == '/') { + pos++; + if (n == '*') { + pos++; + level++; } - } else { - any_non_asterisk = true; } - if (c == '\0' || pos >= max) { + else { + pos++; + } + if (pos >= max) { if (state == DocComment || (state == UnknownComment && maybe_doc_comment)) styler.ColourTo(pos - 1, SCE_RUST_COMMENTBLOCKDOC); else styler.ColourTo(pos - 1, SCE_RUST_COMMENTBLOCK); break; } - pos++; c = styler.SafeGetCharAt(pos, '\0'); } } /* - * The rule for line-doc comments is as follows... /// and //! start doc comments - * unless the comment is composed entirely of /'s followed by whitespace. That is: - * // - comment - * /// - doc-comment - * //// - comment - * ////a - doc-comment + * The rule for line-doc comments is as follows... ///N and //! (where N is a non slash) start doc comments. + * Otherwise it's a normal line comment. */ static void ResumeLineComment(Accessor &styler, int& pos, int max, CommentState state) { bool maybe_doc_comment = false; - int num_leading_slashes = 0; int c = styler.SafeGetCharAt(pos, '\0'); if (c == '/') { - num_leading_slashes = 1; - while (pos < max) { + if (pos < max) { pos++; c = styler.SafeGetCharAt(pos, '\0'); - if (c == '/') { - num_leading_slashes++; - } else { - break; + if (c != '/') { + maybe_doc_comment = true; } } } else if (c == '!') { maybe_doc_comment = true; } - bool non_white_space = false; - while (pos < max && c != '\n' && c != '\0') { - if (!IsWhitespace(c)) - non_white_space = true; + while (pos < max && c != '\n') { if (pos == styler.LineEnd(styler.GetLine(pos))) styler.SetLineState(styler.GetLine(pos), 0); pos++; c = styler.SafeGetCharAt(pos, '\0'); } - maybe_doc_comment |= num_leading_slashes == 1 || (num_leading_slashes > 1 && non_white_space); - if (state == DocComment || (state == UnknownComment && maybe_doc_comment)) styler.ColourTo(pos - 1, SCE_RUST_COMMENTLINEDOC); else @@ -528,14 +539,14 @@ static void ScanComments(Accessor &styler, int& pos, int max) { if (c == '/') ResumeLineComment(styler, pos, max, UnknownComment); else if (c == '*') - ResumeBlockComment(styler, pos, max, UnknownComment); + ResumeBlockComment(styler, pos, max, UnknownComment, 1); } static void ResumeString(Accessor &styler, int& pos, int max) { int c = styler.SafeGetCharAt(pos, '\0'); bool error = false; while (c != '"' && !error) { - if (c == '\0' || pos >= max) { + if (pos >= max) { error = true; break; } @@ -570,6 +581,9 @@ static void ResumeString(Accessor &styler, int& pos, int max) { static void ResumeRawString(Accessor &styler, int& pos, int max, int num_hashes) { for (;;) { + if (pos == styler.LineEnd(styler.GetLine(pos))) + styler.SetLineState(styler.GetLine(pos), num_hashes); + int c = styler.SafeGetCharAt(pos, '\0'); if (c == '"') { pos++; @@ -583,13 +597,12 @@ static void ResumeRawString(Accessor &styler, int& pos, int max, int num_hashes) styler.ColourTo(pos - 1, SCE_RUST_STRINGR); break; } - } else if (c == '\0' || pos >= max) { + } else if (pos >= max) { styler.ColourTo(pos - 1, SCE_RUST_STRINGR); break; + } else { + pos++; } - if (pos == styler.LineEnd(styler.GetLine(pos))) - styler.SetLineState(styler.GetLine(pos), num_hashes); - pos++; } } @@ -618,7 +631,7 @@ void SCI_METHOD LexerRust::Lex(unsigned int startPos, int length, int initStyle, styler.StartSegment(pos); if (initStyle == SCE_RUST_COMMENTBLOCK || initStyle == SCE_RUST_COMMENTBLOCKDOC) { - ResumeBlockComment(styler, pos, max, initStyle == SCE_RUST_COMMENTBLOCKDOC ? DocComment : NotDocComment); + ResumeBlockComment(styler, pos, max, initStyle == SCE_RUST_COMMENTBLOCKDOC ? DocComment : NotDocComment, styler.GetLineState(styler.GetLine(pos) - 1)); } else if (initStyle == SCE_RUST_COMMENTLINE || initStyle == SCE_RUST_COMMENTLINEDOC) { ResumeLineComment(styler, pos, max, initStyle == SCE_RUST_COMMENTLINEDOC ? DocComment : NotDocComment); } else if (initStyle == SCE_RUST_STRING) { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b17b4b: Added the Rust filetype
by dobkeratops 14 Jan '14

14 Jan '14

Branch: refs/heads/master Author: dobkeratops <dobkeratopsgit(a)gmail.com> Committer: SiegeLord <slabode(a)aim.com> Date: Tue, 14 Jan 2014 17:50:37 UTC Commit: b17b4be1260e8828f62c56c87cf8bf886cbbf3b4 https://github.com/geany/geany/commit/b17b4be1260e8828f62c56c87cf8bf886cbbf… Log Message: ----------- Added the Rust filetype Modified Paths: -------------- data/filetypes.rust src/filetypes.c src/filetypes.h Modified: data/filetypes.rust 51 files changed, 51 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,51 @@ +# For complete documentation of this file, please see Geany's main documentation +[styling=C] + +[keywords] +# all items must be in one line +primary=fn type as break const copy do else enum extern fail for if impl let log loop match mod mut priv pub ref return static struct trait unsafe use while in continue alignof be offsetof pure sizeof typeof yield +secondary=bool int uint i8 i16 i32 i64 u8 u16 u32 u64 f32 f64 char str Self self + +[lexer_properties] +styling.within.preprocessor=1 +lexer.cpp.track.preprocessor=0 + +[settings] +lexer_filetype=C + +# default extension used when saving files +extension=rs + +# the following characters are these which a "word" can contains, see documentation +#wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 + +# single comments, like # in this file +comment_single=// +# multiline comments +comment_open=/* +comment_close=*/ + +# set to false if a comment character/string should start at column 0 of a line, true uses any +# indentation of the line, e.g. setting to true causes the following on pressing CTRL+d + #command_example(); +# setting to false would generate this +# command_example(); +# This setting works only for single line comments +comment_use_indent=true + +# context action command (please see Geany's main documentation for details) +context_action_cmd= + +[indentation] +#width=4 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=1 + +[build_settings] +# %f will be replaced by the complete filename +# %e will be replaced by the filename without extension +# (use only one of it at one time) +compiler=rustc "%f" +linker=rustc -o "%e" "%f" +run_cmd="./%e" + Modified: src/filetypes.c 9 files changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -522,6 +522,15 @@ static void init_builtin_filetypes(void) ft->name = g_strdup("PowerShell"); filetype_make_title(ft, TITLE_SOURCE_FILE); ft->group = GEANY_FILETYPE_GROUP_SCRIPT; + +#define RUST + ft = filetypes[GEANY_FILETYPES_RUST]; + ft->lang = 45; + ft->name = g_strdup("Rust"); + filetype_make_title(ft, TITLE_SOURCE_FILE); + ft->mime_type = g_strdup("text/x-rustsrc"); + ft->group = GEANY_FILETYPE_GROUP_COMPILED; + } Modified: src/filetypes.h 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -94,6 +94,7 @@ GEANY_FILETYPES_ABAQUS, GEANY_FILETYPES_BATCH, GEANY_FILETYPES_POWERSHELL, + GEANY_FILETYPES_RUST, /* ^ append items here */ GEANY_MAX_BUILT_IN_FILETYPES /* Don't use this, use filetypes_array->len instead */ } -------------- 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 January 2014