From 9f3e599647faad3c51ab3ae2dc4fb8eaa1bf481a Mon Sep 17 00:00:00 2001 From: benfry Date: Wed, 19 Dec 2012 21:25:29 +0000 Subject: [PATCH] use splitTokens() on keywords to make less fussy, fix constant --- app/src/processing/app/Mode.java | 3 ++- app/src/processing/app/syntax/Token.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java index 9e830fa54..d11193dbe 100644 --- a/app/src/processing/app/Mode.java +++ b/app/src/processing/app/Mode.java @@ -102,7 +102,8 @@ public abstract class Mode { BufferedReader reader = PApplet.createReader(keywordFile); String line = null; while ((line = reader.readLine()) != null) { - String[] pieces = PApplet.trim(PApplet.split(line, '\t')); +// String[] pieces = PApplet.trim(PApplet.split(line, '\t')); + String[] pieces = PApplet.splitTokens(line); if (pieces.length >= 2) { String keyword = pieces[0]; String coloring = pieces[1]; diff --git a/app/src/processing/app/syntax/Token.java b/app/src/processing/app/syntax/Token.java index afdeb9e73..e037e55f7 100644 --- a/app/src/processing/app/syntax/Token.java +++ b/app/src/processing/app/syntax/Token.java @@ -67,7 +67,7 @@ public class Token { public static final byte FUNCTION3 = 13; /** Built-in Processing functions (setup, draw, mouseDragged). */ - public static final byte FUNCTION4 = 13; + public static final byte FUNCTION4 = 14; /** * Operator token id. This can be used to mark an