From 59ba8f5c05174e4078d33e51a23c0b614a98bf01 Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Sat, 24 Jul 2021 13:00:05 -0600 Subject: [PATCH] rename and deprecate field forms for #32 --- kiss/src/kiss/FieldForms.hx | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/kiss/src/kiss/FieldForms.hx b/kiss/src/kiss/FieldForms.hx index de217e1d..ebd2bf19 100644 --- a/kiss/src/kiss/FieldForms.hx +++ b/kiss/src/kiss/FieldForms.hx @@ -29,18 +29,22 @@ class FieldForms { map[newName] = form; } - map["defvar"] = varOrProperty.bind("defvar"); - map["defprop"] = varOrProperty.bind("defprop"); + map["defvar"] = varOrProperty.bind("classVar"); + renameAndDeprecate("defvar", "classVar"); + map["defprop"] = varOrProperty.bind("classProp"); + renameAndDeprecate("defprop", "classProp"); - map["defun"] = funcOrMethod.bind("defun"); - map["defmethod"] = funcOrMethod.bind("defmethod"); + map["defun"] = funcOrMethod.bind("classFunction"); + renameAndDeprecate("defun", "classFunction"); + map["defmethod"] = funcOrMethod.bind("classMethod"); + renameAndDeprecate("defmethod", "classMethod"); return map; } static function fieldAccess(formName:String, fieldName:String, nameExp:ReaderExp, ?access:Array) { if (access == null) { - access = if (formName == "defvar" || formName == "defprop") { + access = if (["defvar", "defprop", "classVar", "classProp"].indexOf(formName) != -1) { [AFinal]; } else { []; @@ -65,7 +69,7 @@ class FieldForms { access.push(AFinal); fieldAccess(formName, fieldName, nameExp, access); default: - if (formName == "defvar" || formName == "defun") { + if (["defvar", "defun", "classVar", "classFunction"].indexOf(formName) != -1) { access.push(AStatic); } access.push(if (fieldName.startsWith("_")) APrivate else APublic);