tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

ob-C.el: Fix regression which mixes int, double, char* types 

* lisp/ob-C.el (org-babel-C-val-to-C-type): Distinguish C, C++, D
  declarations of two-dimensions data.  C and C++ are row major,
  whereas D is column major.

  (org-babel-C-var-to-C): Generate a `typedef' (in C, C++) or an
  `alias' (in D) to carry the type of every two-dimensions matrices.

  (org-babel-C-header-to-C): Move to preferred D declaration,
  `string[n] header;' instead of `string header[n];'.  Use previously
  generated `typedef' or `alias' as the return type of the `data_h()'
  generated access utility functions.

Reported-by: Richard Sent <richard.j.sent@tutamail.com>
This commit is contained in:
tbanel 2021-04-22 09:51:27 +02:00
parent 9b4dbe5f03
commit c43041cf1a
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lisp/ob-C.el
View File

@ -342,7 +342,9 @@ FORMAT can be either a format string or a function which is called with VAL."
`(,(car type) `(,(car type)
(lambda (val) (lambda (val)
(cons (cons
(format "[%d][%d]" (length val) (length (car val))) (pcase org-babel-c-variant
((or `c `cpp) (format "[%d][%d]" (length val) (length (car val))))
(`d (format "[%d][%d]" (length (car val)) (length val))))
(concat (concat
(if (eq org-babel-c-variant 'd) "[\n" "{\n") (if (eq org-babel-c-variant 'd) "[\n" "{\n")
(mapconcat (mapconcat
@ -403,11 +405,23 @@ of the same value."
(formatted (org-babel-C-format-val type-data val)) (formatted (org-babel-C-format-val type-data val))
(suffix (car formatted)) (suffix (car formatted))
(data (cdr formatted))) (data (cdr formatted)))
(format "%s %s%s = %s;" (pcase org-babel-c-variant
type ((or `c `cpp)
var (format "%s\n%s"
suffix (format "typedef %s %s_type;" type var)
data)))) (format "%s %s%s = %s;"
type
var
suffix
data)))
(`d
(format "%s\n%s"
(format "alias %s_type = %s;" var type)
(format "%s%s %s = %s;"
type
suffix
var
data)))))))
(defun org-babel-C-table-sizes-to-C (pair) (defun org-babel-C-table-sizes-to-C (pair)
"Create constants of table dimensions, if PAIR is a table." "Create constants of table dimensions, if PAIR is a table."
@ -456,23 +470,27 @@ specifying a variable with the name of the table."
(let ((table (car head)) (let ((table (car head))
(headers (cdr head))) (headers (cdr head)))
(concat (concat
(format
(pcase org-babel-c-variant (pcase org-babel-c-variant
((or `c `cpp) "const char* %s_header[%d] = {%s};") ((or `c `cpp)
(`d "string %s_header[%d] = [%s];")) (format "const char* %s_header[%d] = {%s};"
table table
(length headers) (length headers)
(mapconcat (lambda (h) (format "%S" h)) headers ",")) (mapconcat (lambda (h) (format "%S" h)) headers ",")))
(`d
(format "string[%d] %s_header = [%s];"
(length headers)
table
(mapconcat (lambda (h) (format "%S" h)) headers ","))))
"\n" "\n"
(pcase org-babel-c-variant (pcase org-babel-c-variant
((or `c `cpp) ((or `c `cpp)
(format (format
"const char* %s_h (int row, const char* col) { return %s[row][get_column_num(%d,%s_header,col)]; }" "%s_type %s_h (int row, const char* col) { return %s[row][get_column_num(%d,%s_header,col)]; }"
table table (length headers) table)) table table table (length headers) table))
(`d (`d
(format (format
"string %s_h (size_t row, string col) { return %s[row][get_column_num(%s_header,col)]; }" "%s_type %s_h (size_t row, string col) { return %s[row][get_column_num(%s_header,col)]; }"
table table table)))))) table table table table))))))
(provide 'ob-C) (provide 'ob-C)