From 906cd4d8a68c36abed99f98b35c725b27b32304b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 6 Apr 2012 05:53:01 +0000 Subject: update python keywords (remove exec, print, add nonlocal) --- source/blender/blenkernel/BKE_text.h | 14 +++++++------- source/blender/blenkernel/intern/DerivedMesh.c | 2 +- source/blender/blenkernel/intern/text.c | 19 ++++++++++--------- 3 files changed, 18 insertions(+), 17 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_text.h b/source/blender/blenkernel/BKE_text.h index efd38cac232..0a94d89a121 100644 --- a/source/blender/blenkernel/BKE_text.h +++ b/source/blender/blenkernel/BKE_text.h @@ -60,8 +60,8 @@ void txt_order_cursors (struct Text *text); 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_prev_marker (struct Text *text, struct TextMarker *marke 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 */ diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 65ef4e5b431..05f5bca03e4 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -31,7 +31,7 @@ #include -#include "limits.h" +#include #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 9715058c51f..4ce159b8aaf 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -622,7 +622,7 @@ void write_text(Text *text, const char *str) /* called directly from rna */ /* 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 @@ static void txt_curs_first (Text *text, TextLine **linep, int *charp) /* 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 @@ int txt_utf8_offset_to_index(char *str, int offset) 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 @@ TextMarker *txt_next_marker(Text *text, TextMarker *marker) /* Character utility functions */ /*******************************/ -int text_check_bracket(char ch) +int text_check_bracket(const char ch) { int a; char opens[] = "([{"; @@ -3259,10 +3259,11 @@ int text_check_bracket(char ch) 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 @@ int text_check_delim(char ch) 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 @@ int text_check_identifier(char ch) 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; -- cgit v1.2.3