[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45434] trunk/blender/source/blender: update python keywords (remove exec, print, add nonlocal)
Campbell Barton
ideasman42 at gmail.com
Fri Apr 6 07:53:01 CEST 2012
Revision: 45434
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45434
Author: campbellbarton
Date: 2012-04-06 05:53:01 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
update python keywords (remove exec, print, add nonlocal)
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_text.h
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/text.c
trunk/blender/source/blender/editors/space_text/text_draw.c
trunk/blender/source/blender/makesrna/intern/rna_define.c
trunk/blender/source/blender/makesrna/intern/rna_particle.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
Modified: trunk/blender/source/blender/blenkernel/BKE_text.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_text.h 2012-04-06 04:46:47 UTC (rev 45433)
+++ trunk/blender/source/blender/blenkernel/BKE_text.h 2012-04-06 05:53:01 UTC (rev 45434)
@@ -60,8 +60,8 @@
int txt_find_string (struct Text *text, const char *findstr, int wrap, int match_case);
int txt_has_sel (struct Text *text);
int txt_get_span (struct TextLine *from, struct TextLine *to);
-int txt_utf8_offset_to_index(char *str, int offset);
-int txt_utf8_index_to_offset(char *str, int index);
+int txt_utf8_offset_to_index(const char *str, int offset);
+int txt_utf8_index_to_offset(const char *str, int index);
void txt_move_up (struct Text *text, short sel);
void txt_move_down (struct Text *text, short sel);
void txt_move_left (struct Text *text, short sel);
@@ -107,11 +107,11 @@
struct TextMarker *txt_next_marker (struct Text *text, struct TextMarker *marker);
/* utility functions, could be moved somewhere more generic but are python/text related */
-int text_check_bracket(char ch);
-int text_check_delim(char ch);
-int text_check_digit(char ch);
-int text_check_identifier(char ch);
-int text_check_whitespace(char ch);
+int text_check_bracket(const char ch);
+int text_check_delim(const char ch);
+int text_check_digit(const char ch);
+int text_check_identifier(const char ch);
+int text_check_whitespace(const char ch);
/* Undo opcodes */
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-04-06 04:46:47 UTC (rev 45433)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-04-06 05:53:01 UTC (rev 45434)
@@ -31,7 +31,7 @@
#include <string.h>
-#include "limits.h"
+#include <limits.h>
#include "MEM_guardedalloc.h"
Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c 2012-04-06 04:46:47 UTC (rev 45433)
+++ trunk/blender/source/blender/blenkernel/intern/text.c 2012-04-06 05:53:01 UTC (rev 45434)
@@ -622,7 +622,7 @@
/* Editing utility functions */
/*****************************/
-static void make_new_line (TextLine *line, char *newline)
+static void make_new_line(TextLine *line, char *newline)
{
if (line->line) MEM_freeN(line->line);
if (line->format) MEM_freeN(line->format);
@@ -770,7 +770,7 @@
/* Cursor movement functions */
/*****************************/
-int txt_utf8_offset_to_index(char *str, int offset)
+int txt_utf8_offset_to_index(const char *str, int offset)
{
int index= 0, pos= 0;
while (pos != offset) {
@@ -780,7 +780,7 @@
return index;
}
-int txt_utf8_index_to_offset(char *str, int index)
+int txt_utf8_index_to_offset(const char *str, int index)
{
int offset= 0, pos= 0;
while (pos != index) {
@@ -3244,7 +3244,7 @@
/* Character utility functions */
/*******************************/
-int text_check_bracket(char ch)
+int text_check_bracket(const char ch)
{
int a;
char opens[] = "([{";
@@ -3259,10 +3259,11 @@
return 0;
}
-int text_check_delim(char ch)
+/* TODO, have a function for operators - http://docs.python.org/py3k/reference/lexical_analysis.html#operators */
+int text_check_delim(const char ch)
{
int a;
- char delims[] = "():\"\' ~!%^&*-+=[]{};/<>|.#\t,";
+ char delims[] = "():\"\' ~!%^&*-+=[]{};/<>|.#\t,@";
for (a=0; a<(sizeof(delims)-1); a++) {
if (ch==delims[a])
@@ -3271,14 +3272,14 @@
return 0;
}
-int text_check_digit(char ch)
+int text_check_digit(const char ch)
{
if (ch < '0') return 0;
if (ch <= '9') return 1;
return 0;
}
-int text_check_identifier(char ch)
+int text_check_identifier(const char ch)
{
if (ch < '0') return 0;
if (ch <= '9') return 1;
@@ -3289,7 +3290,7 @@
return 0;
}
-int text_check_whitespace(char ch)
+int text_check_whitespace(const char ch)
{
if (ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n')
return 1;
Modified: trunk/blender/source/blender/editors/space_text/text_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_draw.c 2012-04-06 04:46:47 UTC (rev 45433)
+++ trunk/blender/source/blender/editors/space_text/text_draw.c 2012-04-06 05:53:01 UTC (rev 45434)
@@ -184,16 +184,23 @@
* a non-identifier (see text_check_identifier(char)) or null character.
*
* If a built-in function is found, the length of the matching name is returned.
- * Otherwise, -1 is returned. */
+ * Otherwise, -1 is returned.
+ *
+ * See:
+ * http://docs.python.org/py3k/reference/lexical_analysis.html#keywords
+ */
static int find_builtinfunc(char *string)
{
int a, i;
- char builtinfuncs[][9] = {"and", "as", "assert", "break", "class", "continue", "def",
- "del", "elif", "else", "except", "exec", "finally",
- "for", "from", "global", "if", "import", "in",
- "is", "lambda", "not", "or", "pass", "print",
- "raise", "return", "try", "while", "yield", "with"};
+ const char *builtinfuncs[] = {
+ /* "False", "None", "True", */ /* see find_bool() */
+ "and", "as", "assert", "break",
+ "class", "continue", "def", "del", "elif", "else", "except",
+ "finally", "for", "from", "global", "if", "import", "in",
+ "is", "lambda", "nonlocal", "not", "or", "pass", "raise",
+ "return", "try", "while", "with", "yield",
+ };
for (a = 0; a < sizeof(builtinfuncs) / sizeof(builtinfuncs[0]); a++) {
i = 0;
Modified: trunk/blender/source/blender/makesrna/intern/rna_define.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_define.c 2012-04-06 04:46:47 UTC (rev 45433)
+++ trunk/blender/source/blender/makesrna/intern/rna_define.c 2012-04-06 05:53:01 UTC (rev 45434)
@@ -376,16 +376,14 @@
{
int a = 0;
- /* list from http://docs.python.org/reference/lexical_analysis.html#id5 */
+ /* list from http://docs.python.org/py3k/reference/lexical_analysis.html#keywords */
static const char *kwlist[] = {
+ /* "False", "None", "True", */
"and", "as", "assert", "break",
- "class", "continue", "def", "del",
- "elif", "else", "except", "exec",
- "finally", "for", "from", "global",
- "if", "import", "in", "is",
- "lambda", "not", "or", "pass",
- "print", "raise", "return", "try",
- "while", "with", "yield", NULL
+ "class", "continue", "def", "del", "elif", "else", "except",
+ "finally", "for", "from", "global", "if", "import", "in",
+ "is", "lambda", "nonlocal", "not", "or", "pass", "raise",
+ "return", "try", "while", "with", "yield", NULL
};
Modified: trunk/blender/source/blender/makesrna/intern/rna_particle.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_particle.c 2012-04-06 04:46:47 UTC (rev 45433)
+++ trunk/blender/source/blender/makesrna/intern/rna_particle.c 2012-04-06 05:53:01 UTC (rev 45434)
@@ -30,9 +30,8 @@
#include <stdio.h>
#include <stdlib.h>
+#include <limits.h>
-#include "limits.h"
-
#include "RNA_define.h"
#include "RNA_enum_types.h"
Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2012-04-06 04:46:47 UTC (rev 45433)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c 2012-04-06 05:53:01 UTC (rev 45434)
@@ -1452,11 +1452,14 @@
RNA_def_property_ui_text(prop, "Line Numbers Background", "");
RNA_def_property_update(prop, 0, "rna_userdef_update");
+ /* no longer used */
+#if 0
prop = RNA_def_property(srna, "scroll_bar", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "shade1");
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Scroll Bar", "");
RNA_def_property_update(prop, 0, "rna_userdef_update");
+#endif
prop = RNA_def_property(srna, "selected_text", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "shade2");
@@ -1479,7 +1482,7 @@
prop = RNA_def_property(srna, "syntax_special", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "syntaxv");
RNA_def_property_array(prop, 3);
- RNA_def_property_ui_text(prop, "Syntax Special", "");
+ RNA_def_property_ui_text(prop, "Decorator", "");
RNA_def_property_update(prop, 0, "rna_userdef_update");
prop = RNA_def_property(srna, "syntax_comment", PROP_FLOAT, PROP_COLOR_GAMMA);
More information about the Bf-blender-cvs
mailing list