Merge pull request #77 from lvolland/fix/delimiters-rs-go-java-lua

fix: delimiters in rs, go, java and lua

Author: matubu

examples/languages/test.go

@@ -18,4 +18,7 @@ func main() {
 
 	// print the value of num
 	fmt.Println(numTest)
+
+	// a raw string keeps its content untouched
+	fmt.Println(`SELECT "n" FROM nums WHERE n = 10`)
 }

examples/languages/test.java

@@ -46,6 +46,10 @@ void run(List<Token>) {
 
 //main function
 public static void main(String[] args) {
+	//the help text, written as a text block
+	String help = """
+		type an expression like "1+2+3"
+		""";
 	String s = "1+2+3";
 	List<Token> tokensList = lexer(s);
 	run(tokensList);

examples/languages/test.lua

@@ -10,6 +10,11 @@
 	We can include "]=]" inside this comment
 f --]==]
 
+--[[
+	This is also a block comment
+	It is closed without the dashes
+]]
+
 vf --tst
 
 a = 'alo\n123"'

examples/languages/test.rs

@@ -7,6 +7,14 @@ use std::net::{TcpListener, TcpStream};
 use std::io::{Read, Write};
 use std::thread;
 
+//the greeting sent to every new client
+const GREETING: &'static str = "hello";
+
+//keep the message up to the first space
+fn first_word<'a>(msg: &'a str) -> &'a str {
+	msg.split(' ').next().unwrap()
+}
+
 //function that handles the client
 fn handle_client(mut stream: TcpStream) {
 	//read the message

src/languages/go.js

@@ -3,6 +3,10 @@ export default [
 		match: /\/\/.*\n?|\/\*((?!\*\/)[^])*(\*\/)?/g,
 		sub: 'todo'
 	},
+	{
+		type: 'str',
+		match: /`[^`]*`?/g
+	},
 	{
 		expand: 'str'
 	},

src/languages/java.js

@@ -3,6 +3,10 @@ export default [
 		match: /\/\/.*\n?|\/\*((?!\*\/)[^])*(\*\/)?/g,
 		sub: 'todo'
 	},
+	{
+		type: 'str',
+		match: /"""(\\[^]|(?!""")[^])*(""")?/g
+	},
 	{
 		expand: 'str'
 	},

src/languages/lua.js

@@ -1,6 +1,6 @@
 export default [
 	{
-		match: /^#!.*|--(\[(=*)\[[^]*?--\]\2\]|.*)/g,
+		match: /^#!.*|--(\[(=*)\[[^]*?\]\2\]|.*)/g,
 		sub: 'todo'
 	},
 	{

src/languages/rs.js

@@ -3,6 +3,11 @@ export default [
 		match: /\/\/.*\n?|\/\*((?!\*\/)[^])*(\*\/)?/g,
 		sub: 'todo'
 	},
+	{
+		// lifetime (ex: "'a")
+		type: 'type',
+		match: /'[a-z_]\w*(?!')/g
+	},
 	{
 		expand: 'str'
 	},